revision-id: bf5bd08607c2a2790eb93c49924733e4cc48ed01 (mariadb-10.2.22-51-gbf5bd08607c) parent(s): e50c7b0b27cc7e651abd0e67b8bd142b007bd61c 3ea49d35bd93c515f3da55b846850ba1125971a0 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 12:07:06 +0200 message: Merge branch '10.2' of github.com:MariaDB/server into 10.2 CMakeLists.txt | 9 +++++++++ cmake/os/Linux.cmake | 2 +- cmake/plugin.cmake | 2 +- mysql-test/suite/galera/disabled.def | 2 +- mysql-test/suite/galera/r/galera_var_notify_cmd.result | 1 + scripts/wsrep_sst_mariabackup.sh | 4 ++-- 6 files changed, 15 insertions(+), 5 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index f11cd61b6c4,1296d494b76..77b6f7ef99e --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -27,10 -26,10 +27,10 @@@ galera_as_slave_replication_bundle : MD 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_gcache_recover_manytrx : MDEV-18834 Galera test failure +galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST -galera_ist_mariabackup : MDEV-18829 test leaves port open +galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail - galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status + galera_ist_progress: MDEV-15236 fails when trying to read transfer status galera_kill_applier : race condition at the start of the test galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl galera_migrate : MariaDB does not support START SLAVE USER