Merge mysql.com:/home/pz/mysql/mysql-4.1-root

into mysql.com:/home/pz/mysql/mysql-4.1

mysql-test/r/rpl_temporary.result

@@ -31,8 +31,8 @@ master-bin.000001	290	Query	1	290	use `test`; create temporary table t3(f int)
 master-bin.000001	357	Query	1	357	use `test`; insert into t3 select * from t1 where f<6
 master-bin.000001	433	Query	1	433	use `test`; create temporary table t3(f int)
 master-bin.000001	500	Query	1	500	use `test`; insert into t2 select count(*) from t3
-master-bin.000001	573	Query	1	573	use `test`; drop temporary table t3
-master-bin.000001	631	Query	1	631	use `test`; insert into t3 select * from t1 where f>=4
+master-bin.000001	573	Query	1	573	use `test`; insert into t3 select * from t1 where f>=4
+master-bin.000001	650	Query	1	650	use `test`; drop temporary table t3
 master-bin.000001	708	Query	1	708	use `test`; insert into t2 select count(*) from t3
 master-bin.000001	781	Query	1	781	use `test`; drop temporary table t3
 drop table if exists t1;

mysql-test/t/rpl_temporary.test

@@ -12,18 +12,23 @@ insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 connection con1;
 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);
+sleep 1;
 
 connection con1;
 insert into t2 select count(*) from t3;
+sleep 1;
 
 connection con2;
 insert into t3 select * from t1 where f>=4;
+sleep 1;
 
 connection con1;
 drop temporary table t3;
+sleep 1;
 
 connection con2;
 insert into t2 select count(*) from t3;