summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-02-27 22:43:42 +0100
committerSergei Golubchik <sergii@pisem.net>2014-02-27 22:43:42 +0100
commit8d0238a6d8d641939730bdcd1ac4928b2c3c413d (patch)
treeb12aa7ed0f3bc307081355a13c30c3420e1a5c8a /mysql-test/suite
parent570c1a6fef03111976d7cc890e65964cffe9fa1d (diff)
downloadmariadb-git-8d0238a6d8d641939730bdcd1ac4928b2c3c413d.tar.gz
MDEV-4955 discover of table non-existance on CREATE
Fix ha_table_exists() to take discovery into account correctly. It must be able to discover both table existence (when no frm is found) and table non-existance (when frm was found).
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/archive/discover.result2
-rw-r--r--mysql-test/suite/archive/discover.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/archive/discover.result b/mysql-test/suite/archive/discover.result
index 726c8712917..e1ca9cb6a65 100644
--- a/mysql-test/suite/archive/discover.result
+++ b/mysql-test/suite/archive/discover.result
@@ -135,7 +135,7 @@ select * from t1;
a
flush tables;
create table t1 (a int) engine=archive;
-ERROR 42S01: Table 't1' already exists
flush tables;
create table t1 (a int) engine=archive;
+ERROR 42S01: Table 't1' already exists
drop table t1;
diff --git a/mysql-test/suite/archive/discover.test b/mysql-test/suite/archive/discover.test
index 144a5dbdcf9..20cb69efa00 100644
--- a/mysql-test/suite/archive/discover.test
+++ b/mysql-test/suite/archive/discover.test
@@ -125,10 +125,10 @@ create table t1 (a int) engine=archive;
select * from t1;
flush tables;
remove_file $mysqld_datadir/test/t1.ARZ;
---error ER_TABLE_EXISTS_ERROR
create table t1 (a int) engine=archive;
remove_file $mysqld_datadir/test/t1.frm;
flush tables;
+--error ER_TABLE_EXISTS_ERROR
create table t1 (a int) engine=archive;
drop table t1;