database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Galera MTR Tests: Various test stability fixes (take #3)

Browse Source
This commit is contained in:
Philip Stoev
2015-08-12 05:32:18 -07:00
committed by Nirbhay Choubey
parent fd0aaad547
commit ff76214a46
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/wait_condition.inc
View File

@ -39,6 +39,7 @@ let $wait_timeout= 0;
let $wait_condition_reps= 0; let $wait_condition_reps= 0;
while ($wait_counter) while ($wait_counter)
{ {
--error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT
let $success= `$wait_condition`; let $success= `$wait_condition`;
inc $wait_condition_reps; inc $wait_condition_reps;
if ($success) if ($success)

1
mysql-test/suite/galera/r/galera_as_slave.result
View File

@ -12,3 +12,4 @@ COUNT(*) = 3
DROP TABLE t1; DROP TABLE t1;
STOP SLAVE; STOP SLAVE;
RESET SLAVE ALL; RESET SLAVE ALL;
RESET MASTER;

3
mysql-test/suite/galera/t/galera_as_slave.test
View File

@ -45,3 +45,6 @@ DROP TABLE t1;
STOP SLAVE; STOP SLAVE;
RESET SLAVE ALL; RESET SLAVE ALL;
--connection node_1
RESET MASTER;

2
mysql-test/suite/galera/t/galera_parallel_simple.test
View File

@ -37,8 +37,6 @@ INSERT INTO t2 VALUES (1);
SELECT COUNT(*) = 10 FROM t1; SELECT COUNT(*) = 10 FROM t1;
SELECT COUNT(*) = 10 FROM t2; SELECT COUNT(*) = 10 FROM t2;
SHOW PROCESSLIST;
SELECT COUNT(DISTINCT ID) FROM INFORMATION_SCHEMA.PROCESSLIST;
SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'committed%'; SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'committed%';
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig; --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;