diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-26 21:15:36 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-26 21:15:36 -0400 |
| commit | 94a61838fe0ed2bd7a26b1b53d49d179d3013c45 (patch) | |
| tree | 63dab01de9014e7cb0d74d3c296292e2a8f47005 /mysql-test | |
| parent | fc799e317d3f4e758c2c7196c2d860f3c20cc98e (diff) | |
| download | mariadb-git-94a61838fe0ed2bd7a26b1b53d49d179d3013c45.tar.gz | |
Fix galera,wsrep tests.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/galera/r/mysql-wsrep#237.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/suite.pm | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/mysql-wsrep#237.test | 5 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/suite.pm | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/mysql-wsrep#237.result b/mysql-test/suite/galera/r/mysql-wsrep#237.result index 3fd9aed1480..1889a8feca0 100644 --- a/mysql-test/suite/galera/r/mysql-wsrep#237.result +++ b/mysql-test/suite/galera/r/mysql-wsrep#237.result @@ -8,3 +8,4 @@ SLEEP(1) 0 SET DEBUG_SYNC= 'now SIGNAL continue'; DROP TABLE t; +SET DEBUG_SYNC= 'RESET'; diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index d6cd4273014..8a25434f2e9 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -68,6 +68,7 @@ push @::global_suppressions, qr|WSREP: gcs_caused\(\) returned .*|, qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|, qr(WSREP: Action message in non-primary configuration from member [0-9]*), + qr(InnoDB: Some resources were not cleaned up in shutdown.*), ); diff --git a/mysql-test/suite/galera/t/mysql-wsrep#237.test b/mysql-test/suite/galera/t/mysql-wsrep#237.test index 7a65cb52ae9..4a539e1ba15 100644 --- a/mysql-test/suite/galera/t/mysql-wsrep#237.test +++ b/mysql-test/suite/galera/t/mysql-wsrep#237.test @@ -28,4 +28,9 @@ SET DEBUG_SYNC= 'now SIGNAL continue'; --connection node_1 --reap +# Cleanup DROP TABLE t; + +--connection node_1a +SET DEBUG_SYNC= 'RESET'; + diff --git a/mysql-test/suite/wsrep/suite.pm b/mysql-test/suite/wsrep/suite.pm index ec7a3e374f5..a1b5fddc628 100644 --- a/mysql-test/suite/wsrep/suite.pm +++ b/mysql-test/suite/wsrep/suite.pm @@ -25,9 +25,11 @@ return "No my_print_defaults" unless $epath; push @::global_suppressions, ( qr(WSREP: Could not open saved state file for reading: ), + qr(WSREP: Could not open state file for reading: .*), qr(WSREP: option --wsrep-causal-reads is deprecated), qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0), qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|, + qr(InnoDB: Some resources were not cleaned up in shutdown.*), ); $ENV{PATH}="$epath:$ENV{PATH}"; |