diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-02 14:44:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-02 14:44:24 +0200 |
| commit | bdf6367d0e019703b48c62b1ae5728e48ba0eba7 (patch) | |
| tree | 33eefe4fb71b829f15ae145249b315bb866354b6 /mysql-test/suite/multi_source | |
| parent | d639aece97e621a71c0419673de561e963b79c2b (diff) | |
| download | mariadb-git-bdf6367d0e019703b48c62b1ae5728e48ba0eba7.tar.gz | |
MDEV-26: Global transaction ID
More fixes for test failures in Buildbot:
- Do not run crashing test in Valgrind.
- FLUSH TABLES did not work to avoid errors about not closed tables when
crashing server. Suppress the messages instead.
- Rewrite multi-source test case to only start one pair of slave threads at a
time, to work-around the bug MDEV-4352.
Diffstat (limited to 'mysql-test/suite/multi_source')
| -rw-r--r-- | mysql-test/suite/multi_source/gtid.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/multi_source/gtid.test | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/suite/multi_source/gtid.result b/mysql-test/suite/multi_source/gtid.result index 28df2aa1fa9..126483725bc 100644 --- a/mysql-test/suite/multi_source/gtid.result +++ b/mysql-test/suite/multi_source/gtid.result @@ -1,12 +1,10 @@ CHANGE MASTER 'slave1' TO master_port=MYPORT_1, master_host='127.0.0.1', master_user='root'; CHANGE MASTER 'slave2' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root'; -start all slaves; -Warnings: -Note 1937 SLAVE 'slave2' started -Note 1937 SLAVE 'slave1' started set default_master_connection = 'slave1'; +START SLAVE; include/wait_for_slave_to_start.inc set default_master_connection = 'slave2'; +START SLAVE; include/wait_for_slave_to_start.inc set default_master_connection = ''; CHANGE MASTER TO master_port=MYPORT_3, master_host='127.0.0.1', master_user='root'; diff --git a/mysql-test/suite/multi_source/gtid.test b/mysql-test/suite/multi_source/gtid.test index 19fb110d070..1352d4a3df4 100644 --- a/mysql-test/suite/multi_source/gtid.test +++ b/mysql-test/suite/multi_source/gtid.test @@ -15,10 +15,11 @@ eval CHANGE MASTER 'slave1' TO master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', master_user='root'; --replace_result $SERVER_MYPORT_2 MYPORT_2 eval CHANGE MASTER 'slave2' TO master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root'; -start all slaves; set default_master_connection = 'slave1'; +START SLAVE; --source include/wait_for_slave_to_start.inc set default_master_connection = 'slave2'; +START SLAVE; --source include/wait_for_slave_to_start.inc set default_master_connection = ''; |