diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-17 11:24:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-17 11:24:38 +0200 |
| commit | 8e80fd6bfdf2ea7d1870662ecd4d8129f3c76301 (patch) | |
| tree | c3ed8b49caac6119deb2e3839f8c0b8662e35b8b /mysql-test/suite/galera | |
| parent | f3e9d9a6e6b2614bf5d57ccf9434c980e4a90424 (diff) | |
| parent | c1aae370879490dc0a3cd63c5b1010fa21b1f62c (diff) | |
| download | mariadb-git-8e80fd6bfdf2ea7d1870662ecd4d8129f3c76301.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/galera')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result index cdf330643c2..380a0235ac2 100644 --- a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result +++ b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result @@ -150,6 +150,7 @@ connection node_3; connection node_2; STOP SLAVE; RESET SLAVE ALL; +set global gtid_slave_pos=""; reset master; #Connection 3 connection node_3; diff --git a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test index 3fe94ad16b7..3ed7ec1d09e 100644 --- a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test +++ b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test @@ -196,6 +196,9 @@ DROP TABLE t2,t1; --connection node_2 STOP SLAVE; RESET SLAVE ALL; +--disable_warnings +set global gtid_slave_pos=""; +--enable_warnings reset master; --echo #Connection 3 |