From 452923b63bcfd277410a233a0568d88148d543a2 Mon Sep 17 00:00:00 2001
From: unknown <jmiller@mysql.com>
Date: Fri, 17 Feb 2006 20:29:46 +0100
Subject: [PATCH] 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
---
 mysql-test/r/rpl_row_drop.result  | 6 ------
 mysql-test/r/rpl_row_sp010.result | 6 +++---
 mysql-test/t/rpl_row_drop.test    | 4 ++--
 mysql-test/t/rpl_row_sp010.test   | 6 +++---
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/mysql-test/r/rpl_row_drop.result b/mysql-test/r/rpl_row_drop.result
index 4ef21884fda..a5abc2837e3 100644
--- a/mysql-test/r/rpl_row_drop.result
+++ b/mysql-test/r/rpl_row_drop.result
@@ -41,12 +41,6 @@ t1
 t2
 **** On Master ****
 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;
 Tables_in_test
 t2
diff --git a/mysql-test/r/rpl_row_sp010.result b/mysql-test/r/rpl_row_sp010.result
index ba97f83b86a..02567465428 100644
--- a/mysql-test/r/rpl_row_sp010.result
+++ b/mysql-test/r/rpl_row_sp010.result
@@ -22,7 +22,7 @@ INSERT INTO test.t1 VALUES(1);
 CALL test.p1();
 END|
 CALL test.p2();
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 a
 1
 2
@@ -40,11 +40,11 @@ INSERT INTO test.t2 VALUES(6);
 CALL test.p3();
 END|
 CALL test.p4();
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 6
 7
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 6
 7
diff --git a/mysql-test/t/rpl_row_drop.test b/mysql-test/t/rpl_row_drop.test
index 816bd108b88..dd6ef331508 100644
--- a/mysql-test/t/rpl_row_drop.test
+++ b/mysql-test/t/rpl_row_drop.test
@@ -31,8 +31,8 @@ connection master;
 # Should drop the non-temporary table t1 and the temporary table t2
 DROP TABLE t1,t2;
 let $VERSION=`select version()`;
---replace_result $VERSION VERSION
-SHOW BINLOG EVENTS;
+#--replace_result $VERSION VERSION
+#SHOW BINLOG EVENTS;
 SHOW TABLES;
 sync_slave_with_master;
 --echo **** On Slave ****
diff --git a/mysql-test/t/rpl_row_sp010.test b/mysql-test/t/rpl_row_sp010.test
index 10940e1e030..28b82217517 100644
--- a/mysql-test/t/rpl_row_sp010.test
+++ b/mysql-test/t/rpl_row_sp010.test
@@ -37,7 +37,7 @@ BEGIN
 END|
 delimiter ;|
 CALL test.p2();
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 
 save_master_pos;
 connection slave;
@@ -59,12 +59,12 @@ BEGIN
 END|
 delimiter ;|
 CALL test.p4();
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 
 save_master_pos;
 connection slave;
 sync_with_master;
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 
 # Cleanup
 connection master;