revision-id: 4a9e653bba8f1847048133da3043be1e7542d6a8 (mariadb-10.1.38-26-g4a9e653bba8) parent(s): cde26a44a023d23dabfebbc5ed5e796eebb64f3e 6567636b09ba410a330cd45285e489c628c4ff37 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-09 08:40:12 +0200 message: Merge branch '10.1' of github.com:MariaDB/server into 10.1 cmake/plugin.cmake | 2 +- dbug/tests.c | 8 + extra/mariabackup/backup_copy.cc | 6 +- extra/mariabackup/backup_mysql.cc | 14 +- extra/mariabackup/encryption_plugin.cc | 8 +- extra/mariabackup/fil_cur.cc | 6 +- extra/mariabackup/xtrabackup.cc | 27 ++- include/my_pthread.h | 6 +- mysql-test/r/mysqld--help,win.rdiff | 2 +- mysql-test/r/mysqld--help.result | 2 +- mysql-test/suite/galera/disabled.def | 19 +- mysql-test/suite/innodb/r/alter_crash.result | 152 ++++++++++++++ mysql-test/suite/innodb/t/alter_crash.test | 229 +++++++++++++++++++++ .../mariabackup/page_compression_level.result | 14 ++ .../suite/mariabackup/page_compression_level.test | 31 +++ mysql-test/suite/sys_vars/inc/sysvars_server.inc | 2 +- .../sys_vars/r/sysvars_server_embedded.result | 4 +- .../sys_vars/r/sysvars_server_notembedded.result | 4 +- .../suite/sys_vars/r/thread_stack_basic.result | 10 +- .../suite/sys_vars/t/thread_stack_basic.test | 10 +- mysql-test/t/mysqld--help.test | 2 +- sql/sql_parse.cc | 5 + storage/innobase/dict/dict0dict.cc | 26 ++- storage/innobase/fts/fts0fts.cc | 8 +- storage/innobase/fts/fts0opt.cc | 19 +- storage/innobase/handler/handler0alter.cc | 12 +- storage/innobase/include/dict0crea.ic | 10 +- storage/innobase/include/ut0dbg.h | 3 +- storage/innobase/row/row0ftsort.cc | 17 +- storage/innobase/row/row0merge.cc | 17 +- storage/innobase/row/row0mysql.cc | 17 +- storage/innobase/srv/srv0start.cc | 7 +- storage/xtradb/dict/dict0dict.cc | 26 ++- storage/xtradb/fts/fts0fts.cc | 13 +- storage/xtradb/fts/fts0opt.cc | 19 +- storage/xtradb/handler/handler0alter.cc | 12 +- storage/xtradb/include/dict0crea.ic | 10 +- storage/xtradb/include/log0online.h | 3 +- storage/xtradb/include/ut0dbg.h | 3 +- storage/xtradb/log/log0online.cc | 7 +- storage/xtradb/row/row0ftsort.cc | 17 +- storage/xtradb/row/row0merge.cc | 17 +- storage/xtradb/row/row0mysql.cc | 17 +- storage/xtradb/srv/srv0start.cc | 7 +- 44 files changed, 679 insertions(+), 171 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 1fc67475b93,4b70a84ac2e..a000ad89217 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -15,28 -18,15 +18,32 @@@ galera_account_management : MariaDB 10. galera_as_master_gtid : Requires MySQL GTID galera_as_master_gtid_change_master : Requires MySQL GTID galera_as_slave_preordered : wsrep-preordered feature not merged to MariaDB - GAL-419 : MDEV-13549 Galera test failures - galera_var_notify_cmd : MDEV-13549 Galera test failures + galera_as_slave_replication_bundle : MDEV-15785 OPTION_GTID_BEGIN is set in Gtid_log_event::do_apply_event() + galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events + galera_binlog_stmt_autoinc : MDEV-13549 auto_increment mismatch + galera_flush : MariaDB does not have global.thread_statistics + galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST + galera_migrate : MariaDB does not support START SLAVE USER + galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb galera_ssl_upgrade : MDEV-13549 Galera test failures +MW-329 : wsrep_local_replays not stable +MW-416 : MDEV-13549 Galera test failures +MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +galera_kill_applier : race condition at the start of the test +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl + galera_var_notify_cmd : MDEV-13549 Galera test failures +galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address - galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit +galera_as_slave_replication_bundle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan + partition : MDEV-13549 regularly showing auto_increment mismatch +galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] +MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] +MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C] +query_cache : MDEV-18137: Galera test failure on query_cache +galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail +galera.galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx