Commit 0ec47798 authored by He Zhenxing's avatar He Zhenxing

Backport fixes for the follow tests

binlog_tmp_table
rpl_row_sp006_InnoDB
rpl_slave_status
parent fa7395c9
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
# Begin clean up test section # Begin clean up test section
connection master; connection master;
--disable_warnings --disable_warnings
create database if not exists mysqltest1; drop database if exists mysqltest1;
create database mysqltest1;
DROP PROCEDURE IF EXISTS mysqltest1.p1; DROP PROCEDURE IF EXISTS mysqltest1.p1;
DROP PROCEDURE IF EXISTS mysqltest1.p2; DROP PROCEDURE IF EXISTS mysqltest1.p2;
DROP TABLE IF EXISTS mysqltest1.t2; DROP TABLE IF EXISTS mysqltest1.t2;
......
reset master;
create table foo (a int); create table foo (a int);
flush logs; flush logs;
create temporary table tmp1_foo like foo; create temporary table tmp1_foo like foo;
......
...@@ -31,6 +31,8 @@ source include/have_binlog_format_mixed_or_statement.inc; ...@@ -31,6 +31,8 @@ source include/have_binlog_format_mixed_or_statement.inc;
connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,); connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
reset master;
create table foo (a int); create table foo (a int);
flush logs; flush logs;
......
...@@ -4,7 +4,8 @@ reset master; ...@@ -4,7 +4,8 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
create database if not exists mysqltest1; drop database if exists mysqltest1;
create database mysqltest1;
DROP PROCEDURE IF EXISTS mysqltest1.p1; DROP PROCEDURE IF EXISTS mysqltest1.p1;
DROP PROCEDURE IF EXISTS mysqltest1.p2; DROP PROCEDURE IF EXISTS mysqltest1.p2;
DROP TABLE IF EXISTS mysqltest1.t2; DROP TABLE IF EXISTS mysqltest1.t2;
......
...@@ -54,6 +54,7 @@ sync_slave_with_master; ...@@ -54,6 +54,7 @@ sync_slave_with_master;
source include/stop_slave.inc; source include/stop_slave.inc;
START SLAVE; START SLAVE;
source include/wait_for_slave_sql_to_start.inc; source include/wait_for_slave_sql_to_start.inc;
source include/wait_for_slave_io_to_stop.inc;
--echo ==== Verify that Slave_IO_Running = No ==== --echo ==== Verify that Slave_IO_Running = No ====
let $result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, 1); let $result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment