Fixed test for 'init_slave' variable

3 files changed, 18 insertions, 17 deletions

diff --git a/mysql-test/r/rpl_init_slave.result b/mysql-test/r/rpl_init_slave.result
index a91b2da85cd..83d0a3289a2 100644
--- a/mysql-test/r/rpl_init_slave.result
+++ b/mysql-test/r/rpl_init_slave.result
@@ -4,20 +4,21 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+show variables like 'init_slave';
+Variable_name	Value
+init_slave	set global max_connections=500
+show variables like 'max_connections';
+Variable_name	Value
+max_connections	500
 reset master;
-create table t1(n int);
-insert into t1 values (@a), (@b);
-select * from t1;
-n
-NULL
-NULL
-select * from t1;
-n
-1
-2
+show variables like 'init_slave';
+Variable_name	Value
+init_slave	
+show variables like 'max_connections';
+Variable_name	Value
+max_connections	100
 set global init_connect="set @c=1";
 show variables like 'init_connect';
 Variable_name	Value
 init_connect	set @c=1
-drop table t1;
 stop slave;
diff --git a/mysql-test/t/rpl_init_slave-slave.opt b/mysql-test/t/rpl_init_slave-slave.opt
index 6433dccf4aa..337e8a60d97 100644
--- a/mysql-test/t/rpl_init_slave-slave.opt
+++ b/mysql-test/t/rpl_init_slave-slave.opt
@@ -1 +1 @@
---init-slave="set @a=1;set @b=2"
+--init-slave="set global max_connections=500"
diff --git a/mysql-test/t/rpl_init_slave.test b/mysql-test/t/rpl_init_slave.test
index 67d35546225..3ea04117ced 100644
--- a/mysql-test/t/rpl_init_slave.test
+++ b/mysql-test/t/rpl_init_slave.test
@@ -6,20 +6,20 @@ source include/master-slave.inc;
 
 save_master_pos;
 connection slave;
+sleep 1;
+show variables like 'init_slave';
+show variables like 'max_connections';
 sync_with_master;
 reset master;
 connection master;
-create table t1(n int);
-insert into t1 values (@a), (@b);
-select * from t1;
+show variables like 'init_slave';
+show variables like 'max_connections';
 save_master_pos;
 connection slave;
 sync_with_master;
-select * from t1;
 set global init_connect="set @c=1";
 show variables like 'init_connect';
 connection master;
-drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;