From bbe6b90b52aa28a9fce6319e08fbe64cd87b8f25 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Tue, 23 Mar 2010 10:28:57 +0300 Subject: [PATCH] Fixed the incorrectly merged rpl.rpl_show_slave_running test in mysql-trunk-merge (by copying the .result/.test files from mysql-pe). --- mysql-test/suite/rpl/r/rpl_show_slave_running.result | 4 ++-- mysql-test/suite/rpl/t/rpl_show_slave_running.test | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_show_slave_running.result b/mysql-test/suite/rpl/r/rpl_show_slave_running.result index 598762d5188..556acb14e5c 100644 --- a/mysql-test/suite/rpl/r/rpl_show_slave_running.result +++ b/mysql-test/suite/rpl/r/rpl_show_slave_running.result @@ -14,11 +14,11 @@ Slave_running OFF Slave_IO_Running= No Slave_SQL_Running= No start slave io_thread; -Slave_running, Slave_IO_Running, Slave_SQL_Running must be OFF NO NO in three following queries +Slave_running, Slave_IO_Running, Slave_SQL_Running must be OFF Connecting NO in three following queries SHOW STATUS LIKE 'Slave_running'; Variable_name Value Slave_running OFF -Slave_IO_Running= No +Slave_IO_Running= Connecting Slave_SQL_Running= No SET DEBUG_SYNC='now SIGNAL signal.io_thread_let_running'; Slave_running, Slave_IO_Running, Slave_SQL_Running must be OFF YES NO in three following queries diff --git a/mysql-test/suite/rpl/t/rpl_show_slave_running.test b/mysql-test/suite/rpl/t/rpl_show_slave_running.test index 8a3e56975ad..8578f1e5275 100644 --- a/mysql-test/suite/rpl/t/rpl_show_slave_running.test +++ b/mysql-test/suite/rpl/t/rpl_show_slave_running.test @@ -8,12 +8,12 @@ source include/have_debug.inc; source include/have_debug_sync.inc; connection slave; + SET DEBUG_SYNC= 'RESET'; source include/stop_slave.inc; let $debug_saved= `select @@global.debug`; set global debug= 'd,dbug.before_get_running_status_yes'; # to block due-started IO - # Test 1. Slave is stopped --echo Slave_running, Slave_IO_Running, Slave_SQL_Running, must be OFF, NO, NO in three following queries @@ -24,8 +24,8 @@ echo Slave_IO_Running= $status; let $status= query_get_value("show slave status", Slave_SQL_Running, 1); echo Slave_SQL_Running= $status; -# Test 2. The slave IO thread is started but not yet got connected to master -# and SQL thread is not started +# Test 2. The slave IO thread is started but not yet got connected to master +# and SQL thread is not started start slave io_thread; @@ -35,7 +35,7 @@ start slave io_thread; # have three: OFF,Connecting,ON. # Hence, 5.1 must display OFF NO NO where as 5.1+ OFF Connecting NO # ---echo Slave_running, Slave_IO_Running, Slave_SQL_Running must be OFF NO NO in three following queries +--echo Slave_running, Slave_IO_Running, Slave_SQL_Running must be OFF Connecting NO in three following queries SHOW STATUS LIKE 'Slave_running'; let $status= query_get_value("show slave status", Slave_IO_Running, 1);