bk commit into 5.1 tree (jmiller:1.2086)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2086 06/02/08 17:09:57 jmiller@stripped +2 -0
  implement a reviw comments

  mysql-test/r/rpl_temporary.result
    1.21 06/02/08 17:09:26 jmiller@stripped +5 -5
    Removed MyISAM per lars

  mysql-test/t/rpl_temporary.test
    1.18 06/02/08 17:09:12 jmiller@stripped +5 -9
    Removed MyISAM per lars

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.20/mysql-test/r/rpl_temporary.result	2006-02-07 23:43:25 +01:00
+++ 1.21/mysql-test/r/rpl_temporary.result	2006-02-08 17:09:26 +01:00
@@ -24,9 +24,9 @@
 create table t1(f int);
 create table t2(f int);
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
-create temporary table t3(f int)ENGINE=MyISAM;
+create temporary table t3(f int);
 insert into t3 select * from t1 where f<6;
-create temporary table t3(f int)ENGINE=MyISAM;
+create temporary table t3(f int);
 insert into t2 select count(*) from t3;
 insert into t3 select * from t1 where f>=4;
 drop temporary table t3;
@@ -46,13 +46,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)ENGINE=MyISAM;
+create temporary table t3(f int);
 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)ENGINE=MyISAM;
+create temporary table t3(f int);
 SET TIMESTAMP=1040324186;
 SET @@session.pseudo_thread_id=1;
 insert into t2 select count(*) from t3;
@@ -73,4 +73,4 @@
 5
 7
 drop table t1,t2;
-create temporary table t3 (f int)ENGINE=MyISAM;
+create temporary table t3 (f int);

--- 1.17/mysql-test/t/rpl_temporary.test	2006-02-07 23:43:16 +01:00
+++ 1.18/mysql-test/t/rpl_temporary.test	2006-02-08 17:09:12 +01:00
@@ -1,7 +1,3 @@
-#########################################################
-# 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
 
@@ -60,12 +56,12 @@
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 
 connection con1;
-create temporary table t3(f int)ENGINE=MyISAM;
+create temporary table t3(f int);
 insert into t3 select * from t1 where f<6;
 sleep 1;
 
 connection con2;
-create temporary table t3(f int)ENGINE=MyISAM;
+create temporary table t3(f int);
 sleep 1;
 
 connection con1;
@@ -103,13 +99,13 @@
 
 SET TIMESTAMP=1040323945;
 SET @@session.pseudo_thread_id=1;
-create temporary table t3(f int)ENGINE=MyISAM;
+create temporary table t3(f int);
 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)ENGINE=MyISAM;
+create temporary table t3(f int);
 SET TIMESTAMP=1040324186;
 SET @@session.pseudo_thread_id=1;
 insert into t2 select count(*) from t3;
@@ -132,7 +128,7 @@
 # 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)ENGINE=MyISAM;
+create temporary table t3 (f int);
 sync_with_master;
 
 # The server will now close done