revision-id: e10a0ab77455269374a3ebe62d54b0017917513c (mariadb-10.4.0-19-ge10a0ab7745) parent(s): 7debbd78596875619bf64af3b1a2406482be36a2 ad710380f888dd88571c610ed6f327573ee9c9b5 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-19 10:13:01 +0200 message: Merge branch 'galera_tests_update' of https://github.com/zdrav1/server into zdrav1-galera_tests_update mysql-test/suite/galera/disabled.def | 7 +- .../galera/r/galera_autoinc_sst_mariabackup.result | 47 +++ .../suite/galera/r/galera_ist_mariabackup.result | 393 +++++++++++++++++++++ ...galera_ist_mariabackup_innodb_flush_logs.result | 204 +++++++++++ .../galera_sst_mariabackup_encrypt_with_key.result | 3 + .../galera/t/galera_autoinc_sst_mariabackup.cnf | 12 + .../galera/t/galera_autoinc_sst_mariabackup.test | 96 +++++ .../suite/galera/t/galera_ist_mariabackup.cnf | 12 + .../suite/galera/t/galera_ist_mariabackup.test | 13 + .../t/galera_ist_mariabackup_innodb_flush_logs.cnf | 14 + .../galera_ist_mariabackup_innodb_flush_logs.test | 14 + .../t/galera_sst_mariabackup_encrypt_with_key.cnf | 12 + .../t/galera_sst_mariabackup_encrypt_with_key.test | 14 + 13 files changed, 840 insertions(+), 1 deletion(-) diff --cc mysql-test/suite/galera/disabled.def index e84832458a3,d12988d669e..301c4aacc0e --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -38,14 -40,11 +37,20 @@@ MW-328C : Timeout galera_gcs_fc_limit : Timeouts pool_of_threads: WSREP has not yet prepared node for application use galera_var_innodb_disallow_writes : Timeout -galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl MW-336 : nondeterministic wsrep_thread_count +galera_binlog_stmt_autoinc : MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc +galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl +galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address +galera_binlog_stmt_autoinc: MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc +galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit +partition : MDEV-13881 galera.partition failed in buildbot with wrong result + galera_sst_xtrabackup-v2 : MDEV-17304 Replace use of XtraBackup with MariaDB Backup + galera_autoinc_sst_xtrabackup : MDEV-17304 Replace use of XtraBackup with MariaDB Backup + galera_ist_innodb_flush_logs : MDEV-17304 Replace use of XtraBackup with MariaDB Backup + galera_ist_xtrabackup-v2 : MDEV-17304 Replace use of XtraBackup with MariaDB Backup; will duplicate galera_sst_mariabackup test + galera_sst_xtrabackup-v2-options : MDEV-17304 Replace use of XtraBackup with MariaDB Backup + galera_sst_xtrabackup-v2_encrypt_with_key : MDEV-17304 Replace use of XtraBackup with MariaDB Backup +galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion +galera_wan : MDEV-17259: Test failure on galera.galera_wan +galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +galera_drop_database : test