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: RPL_SHOW_SLAVE_HOSTS FAILS SPORADICALLY (TIMEOUT

Browse Source 
IN WAIT_SHOW_CONDITION) 

There was a typo in the name of one of the parameters to the
include file wait_show_condition. The parameter name was being
set to "connection" instead of "condition".

We fix this typo, improve one instruction in the test case and
deploy parameter checks inside wait_show_condition.inc.
This commit is contained in:
Luis Soares
2011-05-10 12:41:09 +01:00
parent 4dde684315
commit c9eef1d74a
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 # 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; let $max_run_time= 30;
if ($wait_timeout) 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 Server_id Host Port Master_id
3 slave2 DEFAULT_PORT 1 3 slave2 DEFAULT_PORT 1
2 SLAVE_PORT 1 2 SLAVE_PORT 1
STOP SLAVE IO_THREAD; include/stop_slave_io.inc
include/wait_for_slave_io_to_stop.inc
SHOW SLAVE HOSTS; SHOW SLAVE HOSTS;
Server_id Host Port Master_id Server_id Host Port Master_id
2 SLAVE_PORT 1 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 $show_statement= SHOW SLAVE HOSTS;
let $field= Server_id; let $field= Server_id;
# 3 is server_id of slave2. # 3 is server_id of slave2.
let $connection= ='3'; let $condition= ='3';
source include/wait_show_condition.inc; source include/wait_show_condition.inc;
--replace_result $SLAVE_MYPORT SLAVE_PORT $DEFAULT_MASTER_PORT DEFAULT_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT $DEFAULT_MASTER_PORT DEFAULT_PORT
SHOW SLAVE HOSTS; SHOW SLAVE HOSTS;
connection slave2; connection slave2;
STOP SLAVE IO_THREAD; --source include/stop_slave_io.inc
source include/wait_for_slave_io_to_stop.inc;
connection master; connection master;
let $show_statement= SHOW SLAVE HOSTS; let $show_statement= SHOW SLAVE HOSTS;