1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
This commit is contained in:
jani@labbari.dsl.inet.fi
2007-07-06 09:51:02 +03:00
5 changed files with 41 additions and 2 deletions

View File

@ -636,6 +636,20 @@ SELECT * FROM t3 WHERE a = 'uk';
DROP TABLE t1,t2,t3;
#
# Test bug when trying to drop data file which no InnoDB directory entry
#
create table t1 (a int) engine=innodb;
copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t2.frm;
--error 1146
select * from t2;
drop table t1;
--error 1051
drop table t2;
create table t2 (a int);
drop table t2;
#
# Bug #29154: LOCK TABLES is not atomic when >1 InnoDB tables are locked
@ -670,5 +684,4 @@ DISCONNECT c1;
DISCONNECT c2;
DROP TABLE t1,t2;
--echo End of 5.0 tests