More updates for using NDB as default and some bug fixes along the way

mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/r/rpl_insert_id.result:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/t/rpl_skip_error.test:
  updated to wrk with ndb
mysql-test/r/rpl_skip_error.result:
  updated to wrk with ndb
mysql-test/t/rpl_sporadic_master.test:
  updated to wrk with ndb
mysql-test/r/rpl_sporadic_master.result:
  updated to wrk with ndb
mysql-test/t/rpl_row_trig002.test:
  updated to work with NDB engine
mysql-test/r/rpl_row_trig002.result:
  updated to work with NDB engine
mysql-test/t/rpl_temporary.test:
  updated to work with NDB engine
mysql-test/r/rpl_temporary.result:
  updated to work with NDB engine
mysql-test/extra/rpl_tests/rpl_row_001.test:
  updated to work with NDB as default engine
mysql-test/r/rpl_row_001.result:
  updated to work with NDB as default engine
mysql-test/t/rpl_row_blob_innodb.test:
  Fixed bug in test case
mysql-test/t/rpl_row_blob_innodb-slave.opt:
  Added slave option file to ensure correct engine type on slave
mysql-test/r/rpl_row_blob_innodb.result:
  Updated results
mysql-test/r/rpl_row_blob_myisam.result:
  Updated results
mysql-test/r/rpl_ndb_log.result:
  update results file

1 files changed, 12 insertions, 7 deletions

diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index 0eb5d4074d8..3cd2357e565 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -1,3 +1,8 @@
+#########################################################
+# 2006-02-07 By JBM according to 16552 MyISAM should be used
+# As work around for NDB using temp tables.
+##########################################################
+
 -- source include/master-slave.inc
 
 # Clean up old slave's binlogs.
@@ -55,12 +60,12 @@ create table t2(f int);
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 
 connection con1;
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 insert into t3 select * from t1 where f<6;
 sleep 1;
 
 connection con2;
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 sleep 1;
 
 connection con1;
@@ -79,7 +84,7 @@ connection con2;
 insert into t2 select count(*) from t3;
 drop temporary table t3;
 
-select * from t2;
+select * from t2 ORDER BY f;
 
 # Commented out 8/30/2005 to make compatable with both sbr and rbr
 #--replace_result $VERSION VERSION
@@ -98,13 +103,13 @@ insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 
 SET TIMESTAMP=1040323945;
 SET @@session.pseudo_thread_id=1;
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 SET TIMESTAMP=1040323952;
 SET @@session.pseudo_thread_id=1;
 insert into t3 select * from t1 where f<6;
 SET TIMESTAMP=1040324145;
 SET @@session.pseudo_thread_id=2;
-create temporary table t3(f int);
+create temporary table t3(f int)ENGINE=MyISAM;
 SET TIMESTAMP=1040324186;
 SET @@session.pseudo_thread_id=1;
 insert into t2 select count(*) from t3;
@@ -121,13 +126,13 @@ SET TIMESTAMP=1040324224;
 SET @@session.pseudo_thread_id=2;
 drop temporary table t3;
 
-select * from t2;
+select * from t2 ORDER BY f;
 drop table t1,t2;
 
 # Create last a temporary table that is not dropped at end to ensure that we
 # don't get any memory leaks for this
 
-create temporary table t3 (f int);
+create temporary table t3 (f int)ENGINE=MyISAM;
 sync_with_master;
 
 # The server will now close done