diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-17 11:16:13 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-17 11:16:13 +0100 |
| commit | ef4458af0741dd18a407eff47ede481c816e8f07 (patch) | |
| tree | 4232e7417004f49b782c05a7406b4cc2f1ed845a /mysql-test/include/setup_fake_relay_log.inc | |
| parent | 49ce7daa947bb156daf92cd101495cfe33993afa (diff) | |
| download | mariadb-git-ef4458af0741dd18a407eff47ede481c816e8f07.tar.gz | |
Tests: many if/while expresissons simplified after 57276
Diffstat (limited to 'mysql-test/include/setup_fake_relay_log.inc')
| -rw-r--r-- | mysql-test/include/setup_fake_relay_log.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/include/setup_fake_relay_log.inc b/mysql-test/include/setup_fake_relay_log.inc index c5d709601cf..1b517862235 100644 --- a/mysql-test/include/setup_fake_relay_log.inc +++ b/mysql-test/include/setup_fake_relay_log.inc @@ -40,9 +40,16 @@ let $_fake_relay_log_printable= `SELECT REPLACE('$fake_relay_log', '$MYSQL_TEST_ --echo Setting up fake replication from $_fake_relay_log_printable # Sanity check. +let $running= 0; let $_sql_running= query_get_value(SHOW SLAVE STATUS, Slave_SQL_Running, 1); let $_io_running= query_get_value(SHOW SLAVE STATUS, Slave_IO_Running, 1); -if (`SELECT "$_sql_running" = "Yes" OR "$_io_running" = "Yes"`) { +if ($_sql_running == Yes) { + let $running= 1; +} +if ($_io_running == Yes) { + let $running= 1; +} +if ($running) { --echo Error: Slave was running when test case sourced --echo include/setup_fake_replication.inc --echo Slave_IO_Running = $_io_running; Slave_SQL_Running = $_sql_running |