summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-11-04 21:37:29 +0100
committerSergei Golubchik <sergii@pisem.net>2013-11-04 21:37:29 +0100
commit1ef87c5578a3a5d2a6481b7b0dfbca9b0f3d0e48 (patch)
tree9a1d5fff2f85b9cab5d80d2982c543365fc427c6 /mysql-test/t
parent032a61fc0ac748af272db4f3931d22d48c9e9785 (diff)
downloadmariadb-git-1ef87c5578a3a5d2a6481b7b0dfbca9b0f3d0e48.tar.gz
MDEV-5080 Assertion `strcmp(share->unique_file_name,filename) || share->last_version' fails at /storage/myisam/mi_open.c:67
extend table names discovery (ha_discover_table_names() and Discovered_table_list) to return or optionally filter out temporary tables ("#sql..."). SHOW commands and I_S tables typically want temp table filtered out, while DROP DATABASE wants to see them too. additonally, remove the supression for the warning "Invalid (old?) table or database name" from mtr, and add it to .test files as needed (we need to test that this warning does *not* happen in drop.test)
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/create.test1
-rw-r--r--mysql-test/t/drop.test2
-rw-r--r--mysql-test/t/mysqlcheck.test1
-rw-r--r--mysql-test/t/upgrade.test1
4 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index f82d859243a..a1152045dd9 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1,3 +1,4 @@
+call mtr.add_suppression("table or database name 't-1'");
#
# Check some special create statements.
#
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
index 079b10cf708..2cd87b1d980 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/t/drop.test
@@ -1,3 +1,5 @@
+call mtr.add_suppression("table or database name 'abc`def'");
+
# Initialise
--disable_warnings
drop table if exists t1;
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 06d702495c2..d7dab675dc6 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -1,3 +1,4 @@
+call mtr.add_suppression("Invalid .old.. table or database name");
# Embedded server doesn't support external clients
--source include/not_embedded.inc
diff --git a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test
index c6d01a16f49..18375856a79 100644
--- a/mysql-test/t/upgrade.test
+++ b/mysql-test/t/upgrade.test
@@ -1,3 +1,4 @@
+call mtr.add_suppression("Invalid .old.. table or database name");
-- source include/not_embedded.inc
--disable_warnings