BUG#12535301- SYS_VARS.RPL_INIT_SLAVE_FUNC MISMATCHES IN DAILY-5.5

Problem:
sys_vars.rpl_init_slave_func test was failing sporadically 
on 5.5+.

Fix:
Added assert condition after wait for checks.
Recorded test and enabled it.

3 files changed, 8 insertions, 14 deletions

diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index dca07e1a388..e4c839ce705 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -18,5 +18,3 @@ rpl.rpl_row_sp011  @solaris              # Bug#11753919 2011-07-25 sven Several
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 sys_vars.wait_timeout_func                    # Bug#11750645 2010-04-26 alik wait_timeout_func fails
-
-sys_vars.rpl_init_slave_func		 # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
diff --git a/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
index 3563ecbfe0a..691f6f10e02 100644
--- a/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
+++ b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
@@ -18,19 +18,13 @@ SELECT @@global.init_slave = 'SET @@global.max_connections = @@global.max_connec
 @@global.init_slave = 'SET @@global.max_connections = @@global.max_connections + 1 -- комментарий'
 1
 Expect 1
-SELECT @@global.max_connections= @start_max_connections;
-@@global.max_connections= @start_max_connections
-1
-Expect 1
+include/assert.inc [@@global.max_connections = @start_max_connections]
 STOP SLAVE;
 RESET MASTER;
 RESET SLAVE;
 START SLAVE;
 include/wait_for_slave_to_start.inc
-SELECT @@global.max_connections = @start_max_connections + 1;
-@@global.max_connections = @start_max_connections + 1
-1
-Expect 1
+include/assert.inc [@@global.max_connections = @start_max_connections + 1]
 SET @@global.init_slave = "SET @a=5";
 STOP SLAVE;
 RESET MASTER;
diff --git a/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test b/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
index ffa88941f07..1d57bfeddc5 100644
--- a/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
+++ b/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
@@ -64,8 +64,9 @@ let $wait_timeout= 90;
 let $wait_condition= SELECT @@global.max_connections = @start_max_connections;
 --source include/wait_condition_sp.inc
 # check that the action in init_slave does not happen immediately
-SELECT @@global.max_connections= @start_max_connections;
---echo Expect 1
+--let $assert_text= @@global.max_connections = @start_max_connections
+--let $assert_cond= @@global.max_connections = @start_max_connections
+--source include/assert.inc
 #
 # reset of the server
 STOP SLAVE;
@@ -80,8 +81,9 @@ let $wait_timeout= 90;
 let $wait_condition= SELECT @@global.max_connections = @start_max_connections + 1;
 --source include/wait_condition_sp.inc
 # check that the action in init_slave was executed and had the intended effect
-SELECT @@global.max_connections = @start_max_connections + 1;
---echo Expect 1
+--let $assert_text= @@global.max_connections = @start_max_connections + 1
+--let $assert_cond= @@global.max_connections = @start_max_connections + 1
+--source include/assert.inc
 #
 # Setting a variable(which is local to a session) and must not be visible
 SET @@global.init_slave = "SET @a=5";