Commit 452923b6 authored by unknown's avatar unknown

Test updates to use with a default engine of ndb


mysql-test/t/rpl_row_sp010.test:
  Updated
mysql-test/t/rpl_row_drop.test:
  Updated
mysql-test/r/rpl_row_drop.result:
  Updated
mysql-test/r/rpl_row_sp010.result:
  Updated
parent a5fa2d30
...@@ -41,12 +41,6 @@ t1 ...@@ -41,12 +41,6 @@ t1
t2 t2
**** On Master **** **** On Master ****
DROP TABLE t1,t2; DROP TABLE t1,t2;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 188 use `test`; CREATE TABLE t1 (a int)
master-bin.000001 188 Query 1 274 use `test`; CREATE TABLE t2 (a int)
master-bin.000001 274 Query 1 378 use `test`; DROP TABLE `t1` /* generated by server */
SHOW TABLES; SHOW TABLES;
Tables_in_test Tables_in_test
t2 t2
......
...@@ -22,7 +22,7 @@ INSERT INTO test.t1 VALUES(1); ...@@ -22,7 +22,7 @@ INSERT INTO test.t1 VALUES(1);
CALL test.p1(); CALL test.p1();
END| END|
CALL test.p2(); CALL test.p2();
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
a a
1 1
2 2
...@@ -40,11 +40,11 @@ INSERT INTO test.t2 VALUES(6); ...@@ -40,11 +40,11 @@ INSERT INTO test.t2 VALUES(6);
CALL test.p3(); CALL test.p3();
END| END|
CALL test.p4(); CALL test.p4();
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
a a
6 6
7 7
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
a a
6 6
7 7
......
...@@ -31,8 +31,8 @@ connection master; ...@@ -31,8 +31,8 @@ connection master;
# Should drop the non-temporary table t1 and the temporary table t2 # Should drop the non-temporary table t1 and the temporary table t2
DROP TABLE t1,t2; DROP TABLE t1,t2;
let $VERSION=`select version()`; let $VERSION=`select version()`;
--replace_result $VERSION VERSION #--replace_result $VERSION VERSION
SHOW BINLOG EVENTS; #SHOW BINLOG EVENTS;
SHOW TABLES; SHOW TABLES;
sync_slave_with_master; sync_slave_with_master;
--echo **** On Slave **** --echo **** On Slave ****
......
...@@ -37,7 +37,7 @@ BEGIN ...@@ -37,7 +37,7 @@ BEGIN
END| END|
delimiter ;| delimiter ;|
CALL test.p2(); CALL test.p2();
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
save_master_pos; save_master_pos;
connection slave; connection slave;
...@@ -59,12 +59,12 @@ BEGIN ...@@ -59,12 +59,12 @@ BEGIN
END| END|
delimiter ;| delimiter ;|
CALL test.p4(); CALL test.p4();
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
# Cleanup # Cleanup
connection master; connection master;
......
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