mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
removed undeterministic tests introduced by the fix for bug 26418
mysql-test/r/rpl_innodb.result: removed undeterministic tests mysql-test/t/rpl_innodb.test: removed undeterministic tests
This commit is contained in:
parent
dc22a42954
commit
fe3bd78ea9
2 changed files with 0 additions and 28 deletions
|
@ -77,31 +77,7 @@ SELECT COUNT(*) FROM mysqltest1.t1;
|
||||||
COUNT(*)
|
COUNT(*)
|
||||||
2
|
2
|
||||||
FLUSH LOGS;
|
FLUSH LOGS;
|
||||||
SHOW BINLOG EVENTS IN 'slave-bin.000002' LIMIT 1,8;
|
|
||||||
Log_name Pos Event_type Server_id End_log_pos Info
|
|
||||||
x x x x x DROP DATABASE IF EXISTS mysqltest1
|
|
||||||
x x x x x CREATE DATABASE mysqltest1
|
|
||||||
x x x x x use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT)
|
|
||||||
x x x x x use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB"
|
|
||||||
x x x x x use `test`; INSERT INTO mysqltest1.t1 SET f1= 1
|
|
||||||
x x x x x use `test`; DROP TEMPORARY TABLE mysqltest1.tmp
|
|
||||||
x x x x x use `test`; INSERT INTO mysqltest1.t1 SET f1= 2
|
|
||||||
x x x x x use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp2(a INT)
|
|
||||||
-------- switch to master --------
|
-------- switch to master --------
|
||||||
FLUSH LOGS;
|
FLUSH LOGS;
|
||||||
SHOW BINLOG EVENTS IN 'master-bin.000002' LIMIT 1,12;
|
|
||||||
Log_name Pos Event_type Server_id End_log_pos Info
|
|
||||||
x x x x x DROP DATABASE IF EXISTS mysqltest1
|
|
||||||
x x x x x CREATE DATABASE mysqltest1
|
|
||||||
x x x x x use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT)
|
|
||||||
x x x x x use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB"
|
|
||||||
x x x x x use `test`; BEGIN
|
|
||||||
x x x x x use `test`; INSERT INTO mysqltest1.t1 SET f1= 1
|
|
||||||
x x x x x use `test`; DROP TEMPORARY TABLE mysqltest1.tmp
|
|
||||||
x x x x x use `test`; ROLLBACK
|
|
||||||
x x x x x use `test`; BEGIN
|
|
||||||
x x x x x use `test`; INSERT INTO mysqltest1.t1 SET f1= 2
|
|
||||||
x x x x x use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp2(a INT)
|
|
||||||
x x x x x use `test`; ROLLBACK
|
|
||||||
DROP DATABASE mysqltest1;
|
DROP DATABASE mysqltest1;
|
||||||
End of 5.1 tests
|
End of 5.1 tests
|
||||||
|
|
|
@ -104,14 +104,10 @@ SHOW CREATE TABLE mysqltest1.tmp2;
|
||||||
# it can't be rolled back by the master's ROLLBACK.
|
# it can't be rolled back by the master's ROLLBACK.
|
||||||
SELECT COUNT(*) FROM mysqltest1.t1;
|
SELECT COUNT(*) FROM mysqltest1.t1;
|
||||||
FLUSH LOGS;
|
FLUSH LOGS;
|
||||||
--replace_column 1 x 2 x 3 x 4 x 5 x
|
|
||||||
SHOW BINLOG EVENTS IN 'slave-bin.000002' LIMIT 1,8;
|
|
||||||
|
|
||||||
--echo -------- switch to master --------
|
--echo -------- switch to master --------
|
||||||
connection master;
|
connection master;
|
||||||
FLUSH LOGS;
|
FLUSH LOGS;
|
||||||
--replace_column 1 x 2 x 3 x 4 x 5 x
|
|
||||||
SHOW BINLOG EVENTS IN 'master-bin.000002' LIMIT 1,12;
|
|
||||||
|
|
||||||
DROP DATABASE mysqltest1;
|
DROP DATABASE mysqltest1;
|
||||||
-- source include/master-slave-end.inc
|
-- source include/master-slave-end.inc
|
||||||
|
|
Loading…
Reference in a new issue