test updates

mysql-test/t/rpl_ps.test:
  Added order by for use with NDB
mysql-test/r/rpl_ps.result:
  Added order by for use with NDB
mysql-test/t/rpl_multi_delete.test:
  Added pk for NDB engine
mysql-test/t/rpl_multi_delete2.test:
  Added pk for NDB engine
mysql-test/r/rpl_multi_delete.result:
  Added pk for NDB engine
mysql-test/r/rpl_multi_delete2.result:
  Added pk for NDB engine
mysql-test/t/rpl_loadfile.test:
  Added sleep for use with NDB

7 files changed, 15 insertions, 8 deletions

diff --git a/mysql-test/r/rpl_multi_delete.result b/mysql-test/r/rpl_multi_delete.result
index e94a4e7947e..4831502eb88 100644
--- a/mysql-test/r/rpl_multi_delete.result
+++ b/mysql-test/r/rpl_multi_delete.result
@@ -4,7 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-create table t1 (a int);
+create table t1 (a int primary key);
 create table t2 (a int);
 insert into t1 values (1);
 insert into t2 values (1);
diff --git a/mysql-test/r/rpl_multi_delete2.result b/mysql-test/r/rpl_multi_delete2.result
index 73db9f62eb4..87abe60b268 100644
--- a/mysql-test/r/rpl_multi_delete2.result
+++ b/mysql-test/r/rpl_multi_delete2.result
@@ -24,7 +24,7 @@ use mysqltest_to;
 select * from a;
 i
 3
-create table t1 (a int);
+create table t1 (a int primary key);
 create table t2 (a int);
 insert into t1 values (1);
 insert into t2 values (1);
diff --git a/mysql-test/r/rpl_ps.result b/mysql-test/r/rpl_ps.result
index c969575de76..9127ba0d686 100644
--- a/mysql-test/r/rpl_ps.result
+++ b/mysql-test/r/rpl_ps.result
@@ -11,7 +11,7 @@ set @var1= "from-master-1";
 execute stmt1 using @var1;
 set @var1= "from-master-2-'',";
 execute stmt1 using @var1;
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
 n
 from-master-1
 from-master-2-'',
@@ -19,7 +19,7 @@ set @var2= 'insert into t1 values (concat("from-var-", ?))';
 prepare stmt2 from @var2;
 set @var1='from-master-3';
 execute stmt2 using @var1;
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
 n
 from-master-1
 from-master-2-'',
diff --git a/mysql-test/t/rpl_loadfile.test b/mysql-test/t/rpl_loadfile.test
index 61a0cc46628..148ed58bada 100644
--- a/mysql-test/t/rpl_loadfile.test
+++ b/mysql-test/t/rpl_loadfile.test
@@ -36,6 +36,9 @@ delimiter ;|
 CALL test.p1();
 SELECT * FROM test.t1 ORDER BY blob_column;
 save_master_pos;
+# Need to allow some time when NDB engine is used for
+# the injector thread to have time to populate binlog
+sleep 10;
 sync_slave_with_master;
 connection slave;
 SELECT * FROM test.t1 ORDER BY blob_column;
diff --git a/mysql-test/t/rpl_multi_delete.test b/mysql-test/t/rpl_multi_delete.test
index 2fd7b820b1a..a251cbf8833 100644
--- a/mysql-test/t/rpl_multi_delete.test
+++ b/mysql-test/t/rpl_multi_delete.test
@@ -1,10 +1,11 @@
 source include/master-slave.inc;
-create table t1 (a int);
+create table t1 (a int primary key);
 create table t2 (a int);
 
 insert into t1 values (1);
 insert into t2 values (1);
 
+
 delete t1.* from t1, t2 where t1.a = t2.a;
 
 save_master_pos;
diff --git a/mysql-test/t/rpl_multi_delete2.test b/mysql-test/t/rpl_multi_delete2.test
index c50311de363..81379d4056b 100644
--- a/mysql-test/t/rpl_multi_delete2.test
+++ b/mysql-test/t/rpl_multi_delete2.test
@@ -36,7 +36,7 @@ select * from a;
 
 # BUG#3461
 connection master;
-create table t1 (a int);
+create table t1 (a int primary key);
 create table t2 (a int);
 
 insert into t1 values (1);
diff --git a/mysql-test/t/rpl_ps.test b/mysql-test/t/rpl_ps.test
index adf39b1e4ab..4c8841d564d 100644
--- a/mysql-test/t/rpl_ps.test
+++ b/mysql-test/t/rpl_ps.test
@@ -1,6 +1,9 @@
 #
 # Test of replicating user variables
 #
+###########################################################
+# 2006-02-08 By JBM added order by for use w/ NDB engine
+###########################################################
 source include/master-slave.inc;
 
 #save_master_pos;
@@ -20,7 +23,7 @@ set @var1= "from-master-1";
 execute stmt1 using @var1;
 set @var1= "from-master-2-'',";
 execute stmt1 using @var1;
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
 
 set @var2= 'insert into t1 values (concat("from-var-", ?))';
 prepare stmt2 from @var2;
@@ -30,7 +33,7 @@ execute stmt2 using @var1;
 save_master_pos;
 connection slave;
 sync_with_master;
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
 
 connection master;