mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
Backport fixes for the follow tests
binlog_tmp_table rpl_row_sp006_InnoDB rpl_slave_status
This commit is contained in:
parent
fa7395c9a1
commit
0ec47798fd
5 changed files with 8 additions and 2 deletions
|
@ -11,7 +11,8 @@
|
|||
# Begin clean up test section
|
||||
connection master;
|
||||
--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.p2;
|
||||
DROP TABLE IF EXISTS mysqltest1.t2;
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
reset master;
|
||||
create table foo (a int);
|
||||
flush logs;
|
||||
create temporary table tmp1_foo like foo;
|
||||
|
|
|
@ -31,6 +31,8 @@ source include/have_binlog_format_mixed_or_statement.inc;
|
|||
connect (master,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);
|
||||
|
||||
flush logs;
|
||||
|
|
|
@ -4,7 +4,8 @@ reset master;
|
|||
reset slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
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.p2;
|
||||
DROP TABLE IF EXISTS mysqltest1.t2;
|
||||
|
|
|
@ -54,6 +54,7 @@ sync_slave_with_master;
|
|||
source include/stop_slave.inc;
|
||||
START SLAVE;
|
||||
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 ====
|
||||
let $result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, 1);
|
||||
|
|
Loading…
Reference in a new issue