diff options
| author | Monty <monty@mariadb.org> | 2017-01-04 18:45:23 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-01-11 09:19:45 +0200 |
| commit | de22cd3fe5caa1db8839701e45f379b3b5be7328 (patch) | |
| tree | adb36eba9aa7e72c8f34d1317ea94fad03ecb996 /mysql-test/suite/rpl | |
| parent | bf95970ec03e353f297c3b809219cee91ac40724 (diff) | |
| download | mariadb-git-de22cd3fe5caa1db8839701e45f379b3b5be7328.tar.gz | |
Fixes for failures in test scripts and removal of some compiler warnings
- rpl_gtid_stop_start: Random failure
- sysvars_innodb,32bit: Fixes for 32 bit
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_gtid_stop_start.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_gtid_stop_start.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result b/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result index 3ba17822319..3f3b5e4344a 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result @@ -8,6 +8,7 @@ include/stop_slave.inc Master_Log_File = 'master-bin.000001' Using_Gtid = 'No' CHANGE MASTER TO master_use_gtid=current_pos; +FLUSH LOGS; connection server_1; FLUSH LOGS; include/wait_for_purge.inc "master-bin.000002" diff --git a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test index 65b13b57f2d..09b35011f1f 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test @@ -28,6 +28,7 @@ CHANGE MASTER TO master_use_gtid=current_pos; --write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect wait EOF +FLUSH LOGS; --shutdown_server 30 --source include/wait_until_disconnected.inc |