diff options
| author | monty@hundin.mysql.fi <> | 2001-11-25 13:56:03 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-25 13:56:03 +0200 |
| commit | 22e418b4057ddf9e1fd1c1b9e16a4eb8c3dddbd7 (patch) | |
| tree | 15a60e44c4bfcf310a49c4cb9a111e9f03e84757 /mysql-test | |
| parent | fad7880b579e6133afecc932571993517e734871 (diff) | |
| parent | 777fdb5d5cf3d1fd2fb4fe013acec60ef38f5bce (diff) | |
| download | mariadb-git-22e418b4057ddf9e1fd1c1b9e16a4eb8c3dddbd7.tar.gz | |
merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index f569f2ea405..f0144af24a8 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -858,7 +858,7 @@ insert into test_$1.t3 values(1); commit; drop database test_$1; show tables from test_$1; -Can't read dir of './test_$1/' (Errcode: 2) +Got one of the listed errors create table t1 (a int not null) type= innodb; insert into t1 values(1),(2); truncate table t1; diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 4e107b29cf4..6bac7bb8059 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -527,7 +527,8 @@ create table test_$1.t3 (a int not null) type= heap; insert into test_$1.t3 values(1); commit; drop database test_$1; ---error 12 +# Don't check error message +--error 12,12 show tables from test_$1; # |