database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Backport fixes for the follow tests

Browse Source 
binlog_tmp_table
rpl_row_sp006_InnoDB
rpl_slave_status
This commit is contained in:
He Zhenxing
2009-10-02 17:24:21 +08:00
parent 280bf1cee6
commit 54120363ef
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/extra/rpl_tests/rpl_row_sp006.test
View File

@ -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;

1
mysql-test/suite/binlog/r/binlog_tmp_table.result
View File

@ -1,3 +1,4 @@
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;

2
mysql-test/suite/binlog/t/binlog_tmp_table.test
View File

@ -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;

3
mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
View File

@ -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;

1
mysql-test/suite/rpl/t/rpl_slave_status.test
View File

@ -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);