diff options
| author | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2018-03-27 14:29:43 +0200 |
|---|---|---|
| committer | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2018-04-05 14:43:11 +0200 |
| commit | 45eca6178eb92c88e7c8901c6a03390a7cf8442a (patch) | |
| tree | 9b755b6389921d26b53af5f18ab94555331fc9f9 /mysql-test/suite/galera/t/MW-284.test | |
| parent | 87d763015af09c79b97745a538e25fb9b1730b04 (diff) | |
| download | mariadb-git-45eca6178eb92c88e7c8901c6a03390a7cf8442a.tar.gz | |
MDEV-13549 Fix and re-enable MTR test galera.MW-284
The following changes are committed:
* `RESET MASTER` at the end of the test. This was necessary to allow the test
to run on repeated runs.
* `--source include/galera_wait_ready.inc` after setting `gmcast.isolate=0` to
get back to a primary component.
* Fix for assertion in `Protocol::end_statement()`. The assertion is due to
the fact that function `do_command()` calls `thd->protocol->end_statement()`,
without setting an error, when it is detected that galera is not ready yet.
Following line somehow disappeared in a past merge:
```
my_message(ER_UNKNOWN_COM_ERROR,
"WSREP has not yet prepared node for application use", MYF(0));
```
Diffstat (limited to 'mysql-test/suite/galera/t/MW-284.test')
| -rw-r--r-- | mysql-test/suite/galera/t/MW-284.test | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/t/MW-284.test b/mysql-test/suite/galera/t/MW-284.test index 7add82f1227..5e17baa1bdb 100644 --- a/mysql-test/suite/galera/t/MW-284.test +++ b/mysql-test/suite/galera/t/MW-284.test @@ -24,7 +24,6 @@ SET global wsrep_sync_wait=0; --connection node_3 START SLAVE; ---sleep 1 --let $slave_param= Slave_IO_Running --let $slave_param_value= Connecting --source include/wait_for_slave_param.inc @@ -38,6 +37,7 @@ SET GLOBAL wsrep_provider_options='gmcast.isolate=0'; --source include/wait_for_slave_to_start.inc --connection node_1 +--source include/galera_wait_ready.inc INSERT INTO t1 VALUES (1); --connection node_3 @@ -61,3 +61,10 @@ RESET SLAVE ALL; CALL mtr.add_suppression('failed registering on master'); CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work'); + +--connection node_1 +RESET MASTER; +CALL mtr.add_suppression('WSREP: Last Applied Action message in non-primary configuration from member'); + +--connection node_2 +CALL mtr.add_suppression('WSREP: Last Applied Action message in non-primary configuration from member');
\ No newline at end of file |