diff options
author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-08 00:19:31 +0500 |
---|---|---|
committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-08 00:19:31 +0500 |
commit | 16fc3a2771437239fbb013342f46f0b51f666584 (patch) | |
tree | 56aabf99dd4faa3a91304a13956a4a670661555c /mysql-test/t/innodb_mysql.test | |
parent | 8195a213c2fadfb185e755ce6dda2162df1a5529 (diff) | |
parent | 87e1a302c3bbd0f956883321358da8d1dec0591e (diff) | |
download | mariadb-git-16fc3a2771437239fbb013342f46f0b51f666584.tar.gz |
Merge gleb.loc:/home/uchum/work/bk/5.0
into gleb.loc:/home/uchum/work/bk/5.0-opt
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Merge with 5.0 (main).
Diffstat (limited to 'mysql-test/t/innodb_mysql.test')
-rw-r--r-- | mysql-test/t/innodb_mysql.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index 148181ee443..d4ce997ddb1 100644 --- a/mysql-test/t/innodb_mysql.test +++ b/mysql-test/t/innodb_mysql.test @@ -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 |