summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 15:45:31 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 15:45:31 +0200
commite5a323e107767ceb5106b85d077d4ac9d2d37778 (patch)
tree3ab2bf9c443c5476108d251ac6f9aa9623c2aac3 /mysql-test/t
parentf532653c2920490ac15ad70db0f2f1aaaacb92fe (diff)
downloadmariadb-git-e5a323e107767ceb5106b85d077d4ac9d2d37778.tar.gz
single table discovery: handlerton::discover_table() method.
fixes for need_full_discover_for_existence mode
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/partition_disabled.test2
-rw-r--r--mysql-test/t/show_check.test2
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/partition_disabled.test b/mysql-test/t/partition_disabled.test
index 320d6238502..798fb0aa59e 100644
--- a/mysql-test/t/partition_disabled.test
+++ b/mysql-test/t/partition_disabled.test
@@ -29,7 +29,9 @@ ALTER TABLE t1 ANALYZE PARTITION ALL;
ALTER TABLE t1 REBUILD PARTITION ALL;
ALTER TABLE t1 ENGINE Memory;
ALTER TABLE t1 ADD (new INT);
+--disable_warnings
DROP TABLE t1;
+--enable_warnings
--error ER_OPTION_PREVENTS_STATEMENT
CREATE TABLE t1 (
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index c2edef87d41..32bf5417a0a 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -429,7 +429,9 @@ system echo "this is a junk file for test" >> $MYSQLD_DATADIR/test/t1.frm ;
SHOW TABLE STATUS like 't1';
--error ER_NOT_FORM_FILE
show create table t1;
+--disable_warnings
drop table if exists t1;
+--enable_warnings
--error 1,0
--remove_file $MYSQLD_DATADIR/test/t1.frm