Refresh changelog, patches and wrap-and-sort before upload to unstable

debian/changelog

-mariadb-10.0 (10.0.22-6) UNRELEASED; urgency=low
+mariadb-10.0 (10.0.22-6) unstable; urgency=low
 
   * Add patches to make passwordless root login default on all new
     installs in all situations. Make auth_socket a built-in plugin.
   * Clean up previous passwordless root implementation so that it
     applies only to new installs and existing databases continue
-    to operate with the passwords defined in their user tables.
+    to operate with the passwords defined in their user tables
   * As disabled.def intrepreted test names in a special way, switch
     back to using --skip-test-list option
   * Make the watch file to make it better suited for the
     git-buildpackage workflow and remove call to uupdate
 
- -- Otto Kekäläinen <otto@seravo.fi>  Thu, 17 Dec 2015 15:28:51 +0200
+ -- Otto Kekäläinen <otto@seravo.fi>  Sat, 19 Dec 2015 22:28:23 +0200
 
 mariadb-10.0 (10.0.22-5) unstable; urgency=low
 

debian/mariadb-server-10.0.install

 debian/additions/debian-start etc/mysql
 debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
-debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
+debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
 etc/apparmor.d/usr.sbin.mysqld
 usr/bin/aria_chk
 usr/bin/aria_dump_log

debian/patches/mdev-7550-tokudb.patch

-diff --git a/storage/tokudb/ft-index/portability/portability.cc b/storage/tokudb/ft-index/portability/portability.cc
-index 09c1ccd..a6522b3 100644
 --- a/storage/tokudb/ft-index/portability/portability.cc
 +++ b/storage/tokudb/ft-index/portability/portability.cc
-@@ -355,9 +355,16 @@ toku_get_processor_frequency_cpuinfo(uint64_t *hzret) {
+@@ -355,9 +355,16 @@ toku_get_processor_frequency_cpuinfo(uin
          r = get_error_errno();
      } else {
          uint64_t maxhz = 0;
@@ -22,7 +20,7 @@ index 09c1ccd..a6522b3 100644
              unsigned int cpu;
              sscanf(buf, "processor : %u", &cpu);
              unsigned int ma, mb;
-@@ -367,8 +374,6 @@ toku_get_processor_frequency_cpuinfo(uint64_t *hzret) {
+@@ -367,8 +374,6 @@ toku_get_processor_frequency_cpuinfo(uin
                      maxhz = hz;
              }
          }

debian/patches/mdev-8375-auth-socket-test.patch

@@ -21,7 +21,6 @@ Bug: https://mariadb.atlassian.net/browse/MDEV-8375
  create user tt identified via auth_0x0100;
  grant select on test.* to zzzzzzzzzzzzzzzz;
  connect(localhost,tt,,test,MASTER_MYPORT,MASTER_MYSOCK);
-
 --- a/mysql-test/suite/plugins/t/auth_v0100.test
 +++ b/mysql-test/suite/plugins/t/auth_v0100.test
 @@ -6,7 +6,8 @@ if (!$AUTH_0X0100_SO) {
@@ -34,7 +33,6 @@ Bug: https://mariadb.atlassian.net/browse/MDEV-8375
  
  create user tt identified via auth_0x0100;
  grant select on test.* to zzzzzzzzzzzzzzzz;
-
 --- a/mysql-test/t/mysqld--help.test
 +++ b/mysql-test/t/mysqld--help.test
 @@ -30,7 +30,7 @@ perl;

debian/patches/mdev-8692-perf-arm.patch

@@ -5,9 +5,6 @@ Remove this once upstream has released an official fix.
 Author: Alexander Barkov <bar@mariadb.org>
 Bug: https://mariadb.atlassian.net/browse/MDEV-8692
 
-diff --git a/mysql-test/suite/perfschema/include/have_timer_cycle.inc b/mysql-test/suite/perfschema/include/have_timer_cycle.inc
-new file mode 100644
-index 0000000..b801ea2
 --- /dev/null
 +++ b/mysql-test/suite/perfschema/include/have_timer_cycle.inc
 @@ -0,0 +1,4 @@
@@ -15,11 +12,9 @@ index 0000000..b801ea2
 +{
 +  Skip Need performance timer CYCLE;
 +}
-diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result
-index 49d72fc..c594227 100644
 --- a/mysql-test/suite/perfschema/r/privilege.result
 +++ b/mysql-test/suite/perfschema/r/privilege.result
-@@ -554,7 +554,7 @@ ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'eve
+@@ -554,7 +554,7 @@ ERROR 42000: DROP command denied to user
  #
  # Grant access to change tables with the root account
  GRANT UPDATE ON performance_schema.setup_consumers TO pfs_user_4;
@@ -28,7 +23,7 @@ index 49d72fc..c594227 100644
  GRANT UPDATE, SELECT ON performance_schema.setup_instruments TO pfs_user_4;
  GRANT DROP ON performance_schema.events_waits_current TO pfs_user_4;
  GRANT DROP ON performance_schema.events_waits_history TO pfs_user_4;
-@@ -565,7 +565,7 @@ UPDATE performance_schema.setup_instruments SET enabled = 'YES'
+@@ -565,7 +565,7 @@ UPDATE performance_schema.setup_instrume
  WHERE name LIKE 'wait/synch/mutex/%'
     OR name LIKE 'wait/synch/rwlock/%';
  UPDATE performance_schema.setup_consumers SET enabled = 'YES';
@@ -44,8 +39,6 @@ index 49d72fc..c594227 100644
 -UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE'       where name="wait";
  UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="stage";
  UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="statement";
-diff --git a/mysql-test/suite/perfschema/t/dml_performance_timers.test b/mysql-test/suite/perfschema/t/dml_performance_timers.test
-index 2ec37fb..587c541 100644
 --- a/mysql-test/suite/perfschema/t/dml_performance_timers.test
 +++ b/mysql-test/suite/perfschema/t/dml_performance_timers.test
 @@ -2,6 +2,7 @@
@@ -56,8 +49,6 @@ index 2ec37fb..587c541 100644
  
  --replace_column 2 <frequency> 3 <resolution> 4 <overhead>
  select * from performance_schema.performance_timers;
-diff --git a/mysql-test/suite/perfschema/t/dml_setup_timers.test b/mysql-test/suite/perfschema/t/dml_setup_timers.test
-index 641ac90..bd8822d 100644
 --- a/mysql-test/suite/perfschema/t/dml_setup_timers.test
 +++ b/mysql-test/suite/perfschema/t/dml_setup_timers.test
 @@ -2,6 +2,7 @@
@@ -68,11 +59,9 @@ index 641ac90..bd8822d 100644
  
  # Set to a known state
  update performance_schema.setup_timers
-diff --git a/mysql-test/suite/perfschema/t/privilege.test b/mysql-test/suite/perfschema/t/privilege.test
-index 1864a34..926d90d 100644
 --- a/mysql-test/suite/perfschema/t/privilege.test
 +++ b/mysql-test/suite/perfschema/t/privilege.test
-@@ -291,7 +291,7 @@ TRUNCATE TABLE performance_schema.events_waits_current;
+@@ -291,7 +291,7 @@ TRUNCATE TABLE performance_schema.events
  --echo # Grant access to change tables with the root account
  
  GRANT UPDATE ON performance_schema.setup_consumers TO pfs_user_4;
@@ -105,8 +94,6 @@ index 1864a34..926d90d 100644
  UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="stage";
  UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="statement";
  
-diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c
-index 028c7f8..ad11e8c 100644
 --- a/mysys/my_rdtsc.c
 +++ b/mysys/my_rdtsc.c
 @@ -129,6 +129,31 @@ ulonglong my_timer_cycles_il_x86_64();

debian/patches/mdev-9091-tokudb.patch

@@ -7,8 +7,6 @@ Author: Alexander Barkov <bar@mariadb.org>
 Bug: https://mariadb.atlassian.net/browse/MDEV-9091
 
 
-diff --git a/storage/tokudb/ft-index/portability/CMakeLists.txt b/storage/tokudb/ft-index/portability/CMakeLists.txt
-index 9f84d9b..a356205 100644
 --- a/storage/tokudb/ft-index/portability/CMakeLists.txt
 +++ b/storage/tokudb/ft-index/portability/CMakeLists.txt
 @@ -14,12 +14,12 @@ set(tokuportability_srcs