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,12 +129,14 @@ a	b
 handler t2 read next;
 a	b
 18	eee
+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;
 handler t1 open as t2;
 handler t2 read first;
 a	b
 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 read first;
+Unknown table 't2' in HANDLER
 drop table if exists t1;

mysql-test/t/innodb_handler.test

@@ -62,13 +62,15 @@ handler t2 read a=(19) where b="yyy";
 
 handler t2 read first;
 handler t2 read next;
+--error 1109
+handler t2 read last;
 handler t2 close;
 
 handler t1 open as t2;
 handler t2 read first;
 alter table t1 type=innodb;
---error 1109
-handler t2 read last;
+--error 1064
+handler t2 read first;
 
 drop table if exists t1;