diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-07-05 06:51:29 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-07-05 06:51:29 +0300 |
| commit | 7d56bddfcfb8efb064d403ae2bf67ba81e222722 (patch) | |
| tree | 4a03ba626195ac1a44cc1fd97400786c05a4d76a /mysql-test/suite/galera/t | |
| parent | fee61edd4401ac4e5f6dd71d5de89dd495b821be (diff) | |
| download | mariadb-git-7d56bddfcfb8efb064d403ae2bf67ba81e222722.tar.gz | |
Galera test fixes
Changes to be committed:
modified: suite/galera/disabled.def
modified: suite/galera/r/MW-329.result
modified: suite/galera/r/galera_var_notify_cmd.result
modified: suite/galera/t/MW-329.test
modified: suite/galera/t/galera_binlog_stmt_autoinc.test
modified: suite/galera/t/galera_var_notify_cmd.test
Diffstat (limited to 'mysql-test/suite/galera/t')
| -rw-r--r-- | mysql-test/suite/galera/t/MW-329.test | 5 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_var_notify_cmd.test | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/t/MW-329.test b/mysql-test/suite/galera/t/MW-329.test index 5baa4d14966..dc2693ab859 100644 --- a/mysql-test/suite/galera/t/MW-329.test +++ b/mysql-test/suite/galera/t/MW-329.test @@ -27,6 +27,7 @@ BEGIN SET SESSION wsrep_sync_wait = 0; WHILE 1 DO INSERT INTO t1 (f1) VALUES (FLOOR( 1 + RAND( ) * 65535 )); + SELECT SLEEP(0.1); END WHILE; END| DELIMITER ;| @@ -34,6 +35,8 @@ DELIMITER ;| --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1 --connection node_1b --let $connection_id = `SELECT CONNECTION_ID()` +--disable_query_log +--disable_result_log --send CALL proc_insert(); # @@ -78,6 +81,8 @@ SELECT VARIABLE_VALUE > 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_N --connection node_1b --error 0,2013,1317 --reap +--enable_query_log +--enable_result_log --connection node_1 DROP PROCEDURE proc_insert; diff --git a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test index d3889a89016..817f4f82b43 100644 --- a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test +++ b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test @@ -66,6 +66,8 @@ show variables like 'binlog_format'; SET GLOBAL wsrep_auto_increment_control='OFF'; +let $increment_node1 = `SELECT @@session.auto_increment_increment`; +let $offset_node1 = `SELECT @@session.auto_increment_offset`; SET SESSION auto_increment_increment = 3; SET SESSION auto_increment_offset = 1; diff --git a/mysql-test/suite/galera/t/galera_var_notify_cmd.test b/mysql-test/suite/galera/t/galera_var_notify_cmd.test index 4fea69f62bb..b261f878ced 100644 --- a/mysql-test/suite/galera/t/galera_var_notify_cmd.test +++ b/mysql-test/suite/galera/t/galera_var_notify_cmd.test @@ -10,5 +10,3 @@ SELECT COUNT(DISTINCT uuid) = 2 FROM mtr_wsrep_notify.membership; SELECT MAX(size) = 2 FROM mtr_wsrep_notify.status; SELECT COUNT(DISTINCT idx) = 2 FROM mtr_wsrep_notify.status; - -DROP SCHEMA mtr_wsrep_notify; |