diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-31 23:47:38 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-31 23:47:38 +0400 |
| commit | 2914bad6ac429cd401803210b5a7389d141a27a2 (patch) | |
| tree | 3aa1ba7703851e4f51c6bce20c1be35c0e039b74 /mysql-test/include/mix1.inc | |
| parent | 5713d2e069017b8fbfda9dcf5c3380534e39a52a (diff) | |
| parent | 5404ba422e35d75054d3941b6e52f237fbb46e91 (diff) | |
| download | mariadb-git-2914bad6ac429cd401803210b5a7389d141a27a2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/include/mix1.inc:
Manual merge.
mysql-test/r/innodb_mysql.result:
Manual merge.
Diffstat (limited to 'mysql-test/include/mix1.inc')
| -rw-r--r-- | mysql-test/include/mix1.inc | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 591971a32a4..7ca6bb57909 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -814,6 +814,38 @@ create table t1 (a int) engine=innodb; alter table t1 alter a set default 1; drop table t1; +--echo +--echo Bug#24918 drop table and lock / inconsistent between +--echo perm and temp tables +--echo +--echo Check transactional tables under LOCK TABLES +--echo +--disable_warnings +drop table if exists t24918, t24918_tmp, t24918_trans, t24918_trans_tmp, +t24918_access; +--enable_warnings +create table t24918_access (id int); +create table t24918 (id int) engine=myisam; +create temporary table t24918_tmp (id int) engine=myisam; +create table t24918_trans (id int) engine=innodb; +create temporary table t24918_trans_tmp (id int) engine=innodb; + +lock table t24918 write, t24918_tmp write, t24918_trans write, t24918_trans_tmp write; +drop table t24918; +--error ER_TABLE_NOT_LOCKED +select * from t24918_access; +drop table t24918_trans; +--error ER_TABLE_NOT_LOCKED +select * from t24918_access; +drop table t24918_trans_tmp; +--error ER_TABLE_NOT_LOCKED +select * from t24918_access; +drop table t24918_tmp; +--error ER_TABLE_NOT_LOCKED +select * from t24918_access; +unlock tables; + +drop table t24918_access; # # Bug #28591: MySQL need not sort the records in case of ORDER BY # primary_key on InnoDB table |