Updated changelog and refreshed patches after 10.0.23 import

debian/changelog

+mariadb-10.0 (10.0.23-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Otto Kekäläinen <otto@seravo.fi>  Sun, 20 Dec 2015 14:18:33 +0200
+
 mariadb-10.0 (10.0.22-6) unstable; urgency=low
 
   * Add patches to make passwordless root login default on all new

debian/patches/fix-spelling-errors.patch

@@ -4,7 +4,7 @@ Last-Update: 2014-10-02
 
 --- a/storage/connect/tabxml.cpp
 +++ b/storage/connect/tabxml.cpp
-@@ -1798,7 +1798,7 @@ void XMULCOL::ReadColumn(PGLOBAL g)
+@@ -1800,7 +1800,7 @@ void XMULCOL::ReadColumn(PGLOBAL g)
  
        if (N > Tdbp->Limit) {
          N = Tdbp->Limit;
@@ -13,17 +13,6 @@ Last-Update: 2014-10-02
          PushWarning(g, Tdbp);
          } // endif N
  
---- a/man/mysqldump.1
-+++ b/man/mysqldump.1
-@@ -1275,7 +1275,7 @@ to point the slave to the correct master
- .\" max-allowed-packet option: mysqldump
- \fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
- .sp
--Sets the maximum packet length to send to or recieve from server\&.
-+Sets the maximum packet length to send to or receive from server\&.
- .RE
- .sp
- .RS 4
 --- a/storage/connect/mysql-test/connect/r/xml_mult.result
 +++ b/storage/connect/mysql-test/connect/r/xml_mult.result
 @@ -51,14 +51,14 @@ WEB	XQuery Kick Start	en	Per Bothner	200
@@ -95,7 +84,7 @@ Last-Update: 2014-10-02
  44	ru_UA	Russian - Ukraine	8	11	,	.	russian
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -7097,7 +7097,7 @@ struct my_option my_long_options[]=
+@@ -7095,7 +7095,7 @@ struct my_option my_long_options[]=
     &opt_show_slave_auth_info, &opt_show_slave_auth_info, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"skip-bdb", OPT_DEPRECATED_OPTION,
@@ -104,7 +93,7 @@ Last-Update: 2014-10-02
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
  #ifndef DISABLE_GRANT_OPTIONS
    {"skip-grant-tables", 0,
-@@ -8390,7 +8390,7 @@ mysqld_get_one_option(int optid,
+@@ -8389,7 +8389,7 @@ mysqld_get_one_option(int optid,
      break;
    case OPT_DEPRECATED_OPTION:
      sql_print_warning("'%s' is deprecated. It does nothing and exists only "
@@ -153,7 +142,7 @@ Last-Update: 2014-10-02
    &my_locale_typelib_ab_month_names_pt_PT,
 --- a/storage/spider/spd_param.cc
 +++ b/storage/spider/spd_param.cc
-@@ -1859,7 +1859,7 @@ int spider_param_auto_increment_mode(
+@@ -1882,7 +1882,7 @@ int spider_param_auto_increment_mode(
  static MYSQL_THDVAR_BOOL(
    same_server_link, /* name */
    PLUGIN_VAR_OPCMDARG, /* opt */

debian/patches/mdev-7550-tokudb.patch

---- 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(uin
-         r = get_error_errno();
-     } else {
-         uint64_t maxhz = 0;
--        char *buf = NULL;
--        size_t n = 0;
--        while (getline(&buf, &n, fp) >= 0) {
-+        /*
-+          Some lines in the "/proc/cpuinfo" output can be long, e.g.:
-+            "flags  : fpu vme de pse tsc ms .... smep erms"
-+          In case a line does not fit into "buf", it will be read
-+          in parts by multiple "fgets" calls. This is ok, as
-+          it is very unlikely that a non-leading substring of a line
-+          will match again the pattern "processor: %u".
-+        */
-+        char buf[512];
-+        while (fgets(buf, (int) sizeof(buf), fp) != NULL) {
-             unsigned int cpu;
-             sscanf(buf, "processor : %u", &cpu);
-             unsigned int ma, mb;
-@@ -367,8 +374,6 @@ toku_get_processor_frequency_cpuinfo(uin
-                     maxhz = hz;
-             }
-         }
--        if (buf)
--            free(buf);
-         fclose(fp);
-         *hzret = maxhz;
-         r = maxhz == 0 ? ENOENT : 0;;

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

-Description: The patch fixes performance schema test failures
-on the platforms that do not have a cycle timer implementation.
-
-Remove this once upstream has released an official fix.
-Author: Alexander Barkov <bar@mariadb.org>
-Bug: https://mariadb.atlassian.net/browse/MDEV-8692
-
---- /dev/null
-+++ b/mysql-test/suite/perfschema/include/have_timer_cycle.inc
-@@ -0,0 +1,4 @@
-+if (!`SELECT count(*) FROM performance_schema.performance_timers WHERE timer_name='CYCLE' AND timer_frequency IS NOT NULL`)
-+{
-+  Skip Need performance timer CYCLE;
-+}
---- 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
- #
- # Grant access to change tables with the root account
- GRANT UPDATE ON performance_schema.setup_consumers TO pfs_user_4;
--GRANT UPDATE ON performance_schema.setup_timers TO pfs_user_4;
-+GRANT UPDATE, SELECT ON performance_schema.setup_timers TO pfs_user_4;
- 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_instrume
- WHERE name LIKE 'wait/synch/mutex/%'
-    OR name LIKE 'wait/synch/rwlock/%';
- UPDATE performance_schema.setup_consumers SET enabled = 'YES';
--UPDATE performance_schema.setup_timers SET timer_name = 'TICK';
-+UPDATE performance_schema.setup_timers SET timer_name = 'TICK' WHERE name <> "wait";
- TRUNCATE TABLE performance_schema.events_waits_history_long;
- TRUNCATE TABLE performance_schema.events_waits_history;
- TRUNCATE TABLE performance_schema.events_waits_current;
-@@ -576,6 +576,5 @@ flush privileges;
- UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
- UPDATE performance_schema.setup_consumers SET enabled = 'YES';
- UPDATE performance_schema.setup_timers SET timer_name = 'MICROSECOND' where name="idle";
--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";
---- a/mysql-test/suite/perfschema/t/dml_performance_timers.test
-+++ b/mysql-test/suite/perfschema/t/dml_performance_timers.test
-@@ -2,6 +2,7 @@
- 
- --source include/not_embedded.inc
- --source include/have_perfschema.inc
-+--source include/have_timer_cycle.inc
- 
- --replace_column 2 <frequency> 3 <resolution> 4 <overhead>
- select * from performance_schema.performance_timers;
---- a/mysql-test/suite/perfschema/t/dml_setup_timers.test
-+++ b/mysql-test/suite/perfschema/t/dml_setup_timers.test
-@@ -2,6 +2,7 @@
- 
- --source include/not_embedded.inc
- --source include/have_perfschema.inc
-+--source include/have_timer_cycle.inc
- 
- # Set to a known state
- update performance_schema.setup_timers
---- 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
- --echo # Grant access to change tables with the root account
- 
- GRANT UPDATE ON performance_schema.setup_consumers TO pfs_user_4;
--GRANT UPDATE ON performance_schema.setup_timers TO pfs_user_4;
-+GRANT UPDATE, SELECT ON performance_schema.setup_timers TO pfs_user_4;
- 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;
-@@ -308,7 +308,11 @@ WHERE name LIKE 'wait/synch/mutex/%'
- 
- UPDATE performance_schema.setup_consumers SET enabled = 'YES';
- 
--UPDATE performance_schema.setup_timers SET timer_name = 'TICK';
-+# We do not touch "wait", to avoid restoring it at the end of the test,
-+# as its default value initialized at server startup is ambiguous:
-+# it can be CYCLE or NANOSECOND depending on platform
-+
-+UPDATE performance_schema.setup_timers SET timer_name = 'TICK' WHERE name <> "wait";
- 
- TRUNCATE TABLE performance_schema.events_waits_history_long;
- TRUNCATE TABLE performance_schema.events_waits_history;
-@@ -324,8 +328,9 @@ flush privileges;
- UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
- UPDATE performance_schema.setup_consumers SET enabled = 'YES';
- 
-+# Restore the default values for the timers that we changed.
-+# Note, we did not touch "wait", see above.
- UPDATE performance_schema.setup_timers SET timer_name = 'MICROSECOND' where name="idle";
--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";
- 
---- a/mysys/my_rdtsc.c
-+++ b/mysys/my_rdtsc.c
-@@ -129,6 +129,31 @@ ulonglong my_timer_cycles_il_x86_64();
-   clock_gettime(CLOCK_SGI_CYCLE) for Irix platforms,
-   or on read_real_time for aix platforms. There is
-   nothing for Alpha platforms, they would be tricky.
-+
-+  On the platforms that do not have a CYCLE timer,
-+  "wait" events are initialized to use NANOSECOND instead of CYCLE
-+  during performance_schema initialization (at the server startup).
-+
-+  Linux performance monitor (see "man perf_event_open") can
-+  provide cycle counter on the platforms that do not have
-+  other kinds of cycle counters. But we don't use it so far.
-+
-+  ARM notes
-+  ---------
-+  During tests on ARMv7 Debian, perf_even_open() based cycle counter provided
-+  too low frequency with too high overhead:
-+  MariaDB [performance_schema]> SELECT * FROM performance_timers;
-+  +-------------+-----------------+------------------+----------------+
-+  | TIMER_NAME  | TIMER_FREQUENCY | TIMER_RESOLUTION | TIMER_OVERHEAD |
-+  +-------------+-----------------+------------------+----------------+
-+  | CYCLE       | 689368159       | 1                | 970            |
-+  | NANOSECOND  | 1000000000      | 1                | 308            |
-+  | MICROSECOND | 1000000         | 1                | 417            |
-+  | MILLISECOND | 1000            | 1000             | 407            |
-+  | TICK        | 127             | 1                | 612            |
-+  +-------------+-----------------+------------------+----------------+
-+  Therefore, it was decided not to use perf_even_open() on ARM
-+  (i.e. go without CYCLE and have "wait" events use NANOSECOND by default).
- */
- 
- ulonglong my_timer_cycles(void)

debian/patches/mdev-9091-tokudb.patch

-Description: The patch fixes mysqld crash on shutdown when built
-with CFLAGS="-g -Wl,-Bsymbolic-functions" (which are enabled
-by default on Ubuntu when building packages).
-
-Remove this once upstream has released an official fix.
-Author: Alexander Barkov <bar@mariadb.org>
-Bug: https://mariadb.atlassian.net/browse/MDEV-9091
-
-
---- a/storage/tokudb/ft-index/portability/CMakeLists.txt
-+++ b/storage/tokudb/ft-index/portability/CMakeLists.txt
-@@ -14,12 +14,12 @@ set(tokuportability_srcs
-   )
- 
- add_library(${LIBTOKUPORTABILITY} SHARED ${tokuportability_srcs})
--target_link_libraries(${LIBTOKUPORTABILITY} LINK_PRIVATE ${LIBJEMALLOC})
-+target_link_libraries(${LIBTOKUPORTABILITY})
- target_link_libraries(${LIBTOKUPORTABILITY} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
- 
- add_library(tokuportability_static_conv STATIC ${tokuportability_srcs})
- set_target_properties(tokuportability_static_conv PROPERTIES POSITION_INDEPENDENT_CODE ON)
--set(tokuportability_source_libs tokuportability_static_conv ${LIBJEMALLOC} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
-+set(tokuportability_source_libs tokuportability_static_conv ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
- toku_merge_static_libs(${LIBTOKUPORTABILITY}_static ${LIBTOKUPORTABILITY}_static "${tokuportability_source_libs}")
- 
- maybe_add_gcov_to_libraries(${LIBTOKUPORTABILITY} tokuportability_static_conv)

debian/patches/mysqld_multi_confd.patch

@@ -2,7 +2,7 @@ Description: Makes mysqld_multi reading conf.d (Closes: #778761)
 Author: Jan Wagner <waja@cyconet.org>
 --- a/scripts/mysqld_multi.sh
 +++ b/scripts/mysqld_multi.sh
-@@ -504,6 +504,7 @@ sub list_defaults_files
+@@ -503,6 +503,7 @@ sub list_defaults_files
                 '@prefix@/my.cnf',
                 ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef),
                 $opt{'extra-file'},

debian/patches/series

@@ -10,9 +10,6 @@ innodb_simulate_comp_test_speedup.patch
 fix-spelling-errors.patch
 mysqld_multi_confd.patch
 mysqld_multi.server_lsb-header.patch
-mdev-7550-tokudb.patch
-mdev-8692-perf-arm.patch
-mdev-9091-tokudb.patch
 mdev-8375-passwordless-root-via-socket-auth.patch
 mdev-8375-built-in-auth-socket.patch
 mdev-8375-auth-socket-test.patch