diff options
| author | unknown <jani@labbari.dsl.inet.fi> | 2007-07-06 09:51:02 +0300 |
|---|---|---|
| committer | unknown <jani@labbari.dsl.inet.fi> | 2007-07-06 09:51:02 +0300 |
| commit | 0b24005753b8ddc05827aa29744f75a8538bfeba (patch) | |
| tree | 9df295c9769e2314016f4582bdc66818297f19a3 /mysql-test/t/innodb_mysql.test | |
| parent | 7edcebc97a817f7b157df86504e937600a2716d2 (diff) | |
| parent | cb3ce981c70a0dd12433c9f99994a092f732edaf (diff) | |
| download | mariadb-git-0b24005753b8ddc05827aa29744f75a8538bfeba.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
libmysql/libmysql.c:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge from main 5.1 to 5.1-marvel.
mysql-test/t/innodb_mysql.test:
Manual merge from main 5.1 to 5.1-marvel.
Diffstat (limited to 'mysql-test/t/innodb_mysql.test')
| -rw-r--r-- | mysql-test/t/innodb_mysql.test | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index 25ba9a258ff..f3d552a6868 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 @@ -670,5 +684,4 @@ DISCONNECT c1; DISCONNECT c2; DROP TABLE t1,t2; - --echo End of 5.0 tests |