Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

mysql-test/r/innodb_handler.result

@@ -129,11 +129,12 @@ a	b
 handler t2 read next;
 a	b
 18	eee
-alter table t1 type=innodb;
-handler t2 read next;
+handler t2 close;
+handler t1 open as t2;
+handler t2 read first;
 a	b
-19	fff
+17	ddd
+alter table t1 type=innodb;
 handler t2 read last;
 You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
-handler t2 close;
 drop table if exists t1;

mysql-test/t/innodb_handler.test

@@ -62,15 +62,13 @@ handler t2 read a=(19) where b="yyy";
 
 handler t2 read first;
 handler t2 read next;
-#
-# We alter the table even if it's still in use by to test the Innodb
-# delayed-drop code.  This will generate a warning in the master.err log.
-#
+handler t2 close;
+
+handler t1 open as t2;
+handler t2 read first;
 alter table t1 type=innodb;
-handler t2 read next;
---error 1064
+--error 1109
 handler t2 read last;
 
-handler t2 close;
 drop table if exists t1;