Merge bk-internal:/home/bk/mysql-4.0/

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

2 files changed, 34 insertions, 0 deletions

diff --git a/mysql-test/r/handler.result b/mysql-test/r/handler.result
index 5467ea6dec2..1cfc3a9de8b 100644
--- a/mysql-test/r/handler.result
+++ b/mysql-test/r/handler.result
@@ -173,3 +173,21 @@ Unknown column 'W' in 'field list'
 handler t1 read a=(a);
 Wrong arguments to HANDLER ... READ
 drop table t1;
+create table t1 (a char(5));
+insert into t1 values ("Ok");
+handler t1 open as t;
+handler t read first;
+a
+Ok
+use mysql;
+handler t read first;
+a
+Ok
+handler t close;
+handler test.t1 open as t;
+handler t read first;
+a
+Ok
+handler t close;
+use test;
+drop table t1;
diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test
index 736091a52a9..936902fd9bf 100644
--- a/mysql-test/t/handler.test
+++ b/mysql-test/t/handler.test
@@ -107,3 +107,19 @@ handler t1 read a=(W);
 handler t1 read a=(a);
 drop table t1;
 
+#
+# BUG#2304
+#
+create table t1 (a char(5));
+insert into t1 values ("Ok");
+handler t1 open as t;
+handler t read first;
+use mysql;
+handler t read first;
+handler t close;
+handler test.t1 open as t;
+handler t read first;
+handler t close;
+use test;
+drop table t1;
+