diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-12-01 13:52:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-12-01 13:52:49 +0100 |
| commit | a4baf9b3ea323e3f7947cf6d4520b1243c77a7f4 (patch) | |
| tree | 54f5dd8fb6dc203927960b6c61a202eb9f28d892 | |
| parent | e3108e6d2b71eb27fcad0e32a049a91313aa7c79 (diff) | |
| download | mariadb-git-a4baf9b3ea323e3f7947cf6d4520b1243c77a7f4.tar.gz | |
test failure: make list_files more selective to prevent db.opt from showing up
| -rw-r--r-- | mysql-test/t/partition_innodb.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/partition_innodb_plugin.test | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test index cb7ad4262cc..a74e95ab65b 100644 --- a/mysql-test/t/partition_innodb.test +++ b/mysql-test/t/partition_innodb.test @@ -638,7 +638,6 @@ SELECT * FROM t1 WHERE i1 = ( SELECT i1 FROM t1 WHERE f1=0 LIMIT 1 ); DROP TABLE t1; ---remove_file $MYSQLD_DATADIR/test/db.opt --enable_parsing --echo # diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/t/partition_innodb_plugin.test index 2eb9a2fa2a0..8044ae9ec5c 100644 --- a/mysql-test/t/partition_innodb_plugin.test +++ b/mysql-test/t/partition_innodb_plugin.test @@ -52,7 +52,7 @@ KEY_BLOCK_SIZE=4 PARTITION BY HASH(id) PARTITIONS 1; --replace_result #p# #P# ---list_files $MYSQLD_DATADIR/test +--list_files $MYSQLD_DATADIR/test t1* SHOW CREATE TABLE t1; SET GLOBAL innodb_file_per_table = OFF; @@ -71,14 +71,14 @@ LOCK TABLE t1 WRITE; ALTER TABLE t1 ADD PARTITION PARTITIONS 1; --replace_result #p# #P# ---list_files $MYSQLD_DATADIR/test +--list_files $MYSQLD_DATADIR/test t1* --echo # This SET is not needed to reproduce the bug, --echo # it is here just to make the test case more realistic SET innodb_strict_mode = OFF; ALTER TABLE t1 ADD PARTITION PARTITIONS 2; --replace_result #p# #P# ---list_files $MYSQLD_DATADIR/test +--list_files $MYSQLD_DATADIR/test t1* # really bug#56172 ALTER TABLE t1 REBUILD PARTITION p0; |