revision-id: 348797717b351b22de7da44cdf42d45c8901f9bd (mariadb-10.3.6-270-g348797717b3) parent(s): c0b7eb3d089283c0a934b643f5e3a5267ea01c4a author: Jan Lindström committer: Jan Lindström timestamp: 2018-12-27 09:38:57 +0200 message: Fix Windows test failure. --- mysql-test/include/wait_wsrep_ready.inc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mysql-test/include/wait_wsrep_ready.inc b/mysql-test/include/wait_wsrep_ready.inc index 7ff65136c92..644ac2351c0 100644 --- a/mysql-test/include/wait_wsrep_ready.inc +++ b/mysql-test/include/wait_wsrep_ready.inc @@ -6,26 +6,29 @@ --disable_query_log --disable_result_log +# +# Firstly, make sure that wsrep plugin is available +# +if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`) +{ # # if node is not ready, SELECT @@GLOBAL.WSREP_ON below does not # succeed. However, we can force it to succeed by running the SELECT # with dirty reads configuration. So we prepare for that # ---let $my_dirty_reads= `select @@wsrep_dirty_reads` -SET wsrep_dirty_reads = ON; + --let $my_dirty_reads= `select @@wsrep_dirty_reads` + SET wsrep_dirty_reads = ON; -if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`) -{ if (`SELECT @@GLOBAL.WSREP_ON`) { --source include/galera_wait_ready.inc --disable_query_log --disable_result_log } -} # ..and returning original dirty read selection here ---eval SET wsrep_dirty_reads = $my_dirty_reads; + --eval SET wsrep_dirty_reads = $my_dirty_reads; +} --enable_query_log --enable_result_log