Automatic merge with 5.1

3 files changed, 0 insertions, 136 deletions

diff --git a/mysql-test/t/handler_innodb.test b/mysql-test/t/handler_innodb.test
deleted file mode 100644
index 02982716f78..00000000000
--- a/mysql-test/t/handler_innodb.test
+++ /dev/null
@@ -1,20 +0,0 @@
-# t/handler_innodb.test
-#
-# test of HANDLER ...
-#
-# Last update:
-# 2006-07-31 ML test refactored (MySQL 5.1)
-#               code of t/handler.test and t/innodb_handler.test united
-#               main testing code put into include/handler.inc
-#               rename t/innodb_handler.test to t/handler_innodb.test
-#
-
-# should work in embedded server after mysqltest is fixed
---source include/not_embedded.inc
-
---source include/have_innodb.inc
-let $engine_type= InnoDB;
-let $other_engine_type= MEMORY;
-let $other_handler_engine_type= MyISAM;
-
---source include/handler.inc
diff --git a/mysql-test/t/handler_myisam.test b/mysql-test/t/handler_myisam.test
deleted file mode 100644
index e78072ef8a0..00000000000
--- a/mysql-test/t/handler_myisam.test
+++ /dev/null
@@ -1,100 +0,0 @@
-# t/handler_myisam.test
-#
-# test of HANDLER ...
-#
-# Last update:
-# 2006-07-31 ML test refactored (MySQL 5.1)
-#               code of t/handler.test and t/innodb_handler.test united
-#               main testing code put into include/handler.inc
-#               rename t/handler.test to t/handler_myisam.test
-#
-
-# should work in embedded server after mysqltest is fixed
---source include/not_embedded.inc
-
-let $engine_type= MyISAM;
-let $other_engine_type= MEMORY;
-# There is unfortunately no other all time available storage engine
-# which supports the handler interface
-let $other_handler_engine_type= MyISAM;
-
---source include/handler.inc
-
---echo #
---echo # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash 
---echo #
-CREATE TABLE t1 AS SELECT 1 AS f1; 
-HANDLER t1 OPEN;
-TRUNCATE t1;
---error ER_UNKNOWN_TABLE
-HANDLER t1 READ FIRST;
-DROP TABLE t1;
-
-CREATE TEMPORARY TABLE t1 AS SELECT 1 AS f1; 
-HANDLER t1 OPEN;
-TRUNCATE t1;
---error ER_UNKNOWN_TABLE
-HANDLER t1 READ FIRST;
-DROP TABLE t1;
-
---echo #
---echo # BUG#51877 - HANDLER interface causes invalid memory read
---echo #
-CREATE TABLE t1(a INT, KEY(a));
-HANDLER t1 OPEN;
-HANDLER t1 READ a FIRST;
-INSERT INTO t1 VALUES(1);
-HANDLER t1 READ a NEXT;
-HANDLER t1 CLOSE;
-DROP TABLE t1;
-
-
---echo #
---echo # Bug #54007: assert in ha_myisam::index_next , HANDLER
---echo #
-CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a), KEY b(b), KEY ab(a, b));
-
-HANDLER t1 OPEN;
-HANDLER t1 READ FIRST;
-HANDLER t1 READ `PRIMARY` NEXT;
-HANDLER t1 READ ab NEXT;
-HANDLER t1 READ b NEXT;
-HANDLER t1 READ NEXT;
-HANDLER t1 CLOSE;
-
-INSERT INTO t1 VALUES (2, 20), (1, 10), (4, 40), (3, 30);
-HANDLER t1 OPEN;
-HANDLER t1 READ FIRST;
-HANDLER t1 READ NEXT;
-HANDLER t1 READ `PRIMARY` NEXT;
-HANDLER t1 READ `PRIMARY` NEXT;
-HANDLER t1 READ ab NEXT;
-HANDLER t1 READ ab NEXT;
-HANDLER t1 READ b NEXT;
-HANDLER t1 READ b NEXT;
-HANDLER t1 READ b NEXT;
-HANDLER t1 READ b NEXT;
-HANDLER t1 READ b NEXT;
-HANDLER t1 READ NEXT;
-HANDLER t1 READ NEXT;
-HANDLER t1 READ NEXT;
-HANDLER t1 CLOSE;
-
-HANDLER t1 OPEN;
-HANDLER t1 READ FIRST;
-HANDLER t1 READ `PRIMARY` PREV;
-HANDLER t1 READ `PRIMARY` PREV;
-HANDLER t1 READ b PREV;
-HANDLER t1 READ b PREV;
-HANDLER t1 CLOSE;
-
-HANDLER t1 OPEN;
-HANDLER t1 READ FIRST;
-HANDLER t1 READ `PRIMARY` PREV LIMIT 3;
-HANDLER t1 READ b NEXT LIMIT 5;
-HANDLER t1 CLOSE;
-
-DROP TABLE t1;
-
-
---echo End of 5.1 tests
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
index 4df1a0f3478..742a83f7bad 100644
--- a/mysql-test/t/lock_multi.test
+++ b/mysql-test/t/lock_multi.test
@@ -484,22 +484,6 @@ unlock tables;
 connection default;
 drop table t1;
 
-#
-# Bug#25856 HANDLER table OPEN in one connection lock DROP TABLE in another one
-#
---disable_warnings
-drop table if exists t1;
---enable_warnings
-create table t1 (a int) ENGINE=MEMORY;
---echo --> client 2
-connection locker;
---error ER_ILLEGAL_HA
-handler t1 open;
---echo --> client 1
-connection default;
-drop table t1;
-
-
 # Disconnect sessions used in many subtests above
 disconnect locker;
 disconnect reader;