Skip to content

Commit

Permalink
Fixed parts.partition_reorganize_innodb test flakiness
Browse files Browse the repository at this point in the history
Summary:
Similar to D6163456
We are basically cleaning up and starting fresh when starting the test.

Reviewed By: abhinav04sharma

Differential Revision: D6657158

fbshipit-source-id: ab13fb7
  • Loading branch information
yashtc authored and facebook-github-bot committed Jan 3, 2018
1 parent f4282f7 commit 92ee491
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
5 changes: 5 additions & 0 deletions mysql-test/suite/parts/r/partition_reorganize_innodb.result
Expand Up @@ -2,6 +2,9 @@ SET default_storage_engine=InnoDB;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table=ON;
SET GLOBAL innodb_file_format=barracuda;
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
use test;
#
# CREATE a table with SUBPARTITIONS
#
Expand Down Expand Up @@ -70,6 +73,7 @@ MYSQL_TMP_DIR/alt_dir_northeast/test/emp#p#northeast#sp#ne1.ibd
MYSQL_TMP_DIR/alt_dir_southwest/test/emp#p#southwest#sp#sw2.ibd
MYSQL_TMP_DIR/alt_dir_southwest/test/emp#p#southwest#sp#sw3.ibd
---- MYSQLD_DATADIR/test
db.opt
emp#p#northeast#sp#ne0.isl
emp#p#northeast#sp#ne1.isl
emp#p#southwest#sp#sw2.isl
Expand Down Expand Up @@ -167,6 +171,7 @@ MYSQL_TMP_DIR/alt_dir_west/test/emp#p#west#sp#w1.ibd
MYSQL_TMP_DIR/alt_dir_south/test/emp#p#south#sp#s0.ibd
MYSQL_TMP_DIR/alt_dir_south/test/emp#p#south#sp#s1.ibd
---- MYSQLD_DATADIR/test
db.opt
emp#p#east#sp#e0.isl
emp#p#east#sp#e1.isl
emp#p#north#sp#n0.isl
Expand Down
6 changes: 6 additions & 0 deletions mysql-test/suite/parts/t/partition_reorganize_innodb.test
Expand Up @@ -19,6 +19,12 @@ SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table=ON;
SET GLOBAL innodb_file_format=barracuda;

--disable_warnings
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
use test;
--enable_warnings

# Unlike MyISAM, InnoDB creates the subdirectories given to it in the
# DATA DIRECTORY clauses. Another difference is that InnoDB uses an extra
# directory under DATA DIRECTORY with the name of the database.
Expand Down

0 comments on commit 92ee491

Please sign in to comment.