database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

BUG#12416700

Browse Source 
Automerged bzr bundle from bug report into latest mysql-5.5.
This commit is contained in:
Luis Soares
2011-05-11 15:16:17 +01:00
parent d8a9b36b9d c9eef1d74a
commit efc20dca00
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/include/wait_show_condition.inc
View File

@ -31,6 +31,21 @@
# Created: 2009-02-18 mleich
#
if (!$condition)
{
--die ERROR IN TEST: the "condition" variable must be set
}
if (!$field)
{
--die ERROR IN TEST: the "field" variable must be set
}
if (!$show_statement)
{
--die ERROR IN TEST: the "show_statement" variable must be set
}
let $max_run_time= 30;
if ($wait_timeout)
{

3
mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
View File

@ -8,8 +8,7 @@ SHOW SLAVE HOSTS;
Server_id Host Port Master_id
3 slave2 DEFAULT_PORT 1
2 SLAVE_PORT 1
STOP SLAVE IO_THREAD;
include/wait_for_slave_io_to_stop.inc
include/stop_slave_io.inc
SHOW SLAVE HOSTS;
Server_id Host Port Master_id
2 SLAVE_PORT 1

5
mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
View File

@ -23,14 +23,13 @@ connection master;
let $show_statement= SHOW SLAVE HOSTS;
let $field= Server_id;
# 3 is server_id of slave2.
let $connection= ='3';
let $condition= ='3';
source include/wait_show_condition.inc;
--replace_result $SLAVE_MYPORT SLAVE_PORT $DEFAULT_MASTER_PORT DEFAULT_PORT
SHOW SLAVE HOSTS;
connection slave2;
STOP SLAVE IO_THREAD;
source include/wait_for_slave_io_to_stop.inc;
--source include/stop_slave_io.inc
connection master;
let $show_statement= SHOW SLAVE HOSTS;