diff options
author | unknown <mattiasj@witty.> | 2008-03-17 16:18:02 +0100 |
---|---|---|
committer | unknown <mattiasj@witty.> | 2008-03-17 16:18:02 +0100 |
commit | 7a22a8a965dbfb3e406f9c9d3ff6427c3ac18084 (patch) | |
tree | 7b9d1f2e9b66e950687cc42c41a8e2f9eb174536 /mysql-test/suite/parts/inc/partition_basic_symlink.inc | |
parent | 166357b552fe777bc509ffcaeafeeeb5f0e3deed (diff) | |
download | mariadb-git-7a22a8a965dbfb3e406f9c9d3ff6427c3ac18084.tar.gz |
Bug#35306: partition_basic_symlink test failures
Have changed the DATA/INDEX dir to not be a database dir.
(and made some changes for better result files.)
mysql-test/suite/parts/inc/partition_basic_symlink.inc:
Bug#35306: partition_basic_symlink test failures
after bug 32167 it is not allowed with DATA/INDEX DIR in any database
directory.
remade the inc-files to make better use of each other (less duplicate tests)
mysql-test/suite/parts/inc/partition_directory.inc:
Removed disable/enable_query_log for better result files
mysql-test/suite/parts/inc/partition_layout_check1.inc:
changed DATA/INDEX DIR
mysql-test/suite/parts/inc/partition_layout_check2.inc:
added check with_directories
mysql-test/suite/parts/inc/partition_methods1.inc:
Removed disable/enable_query_log for better result files
mysql-test/suite/parts/inc/partition_methods2.inc:
Removed disable/enable_query_log for better result files
Added with_directories for testing of DATA/INDEX DIR
mysql-test/suite/parts/r/partition_basic_innodb.result:
Updated test result due to test case changes
mysql-test/suite/parts/r/partition_basic_myisam.result:
Updated test result due to test case changes
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
Updated test result due to test case changes
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
Updated test result due to test case changes
mysql-test/suite/parts/t/disabled.def:
Bug#35306: parts.partition_basic_symlink test failures
Enable the test again since the have been fixed
mysql-test/suite/parts/t/partition_basic_innodb.test:
Added check for table files.
mysql-test/suite/parts/t/partition_basic_myisam.test:
removing dependency of symlink
(test exists now in parts.partition_basic_symlink_myisam)
mysql-test/suite/parts/t/partition_basic_symlink_innodb.test:
Bug#35306: partition_basic_symlink test failures
Removed old test (since DATA/INDEX DIRECTORY is not supported in InnoDB)
and replaced it with a simple test that altering a partitioned innodb
with DATA/INDEX DIR to MyISAM, would use the DATA/INDEX DIR.
Diffstat (limited to 'mysql-test/suite/parts/inc/partition_basic_symlink.inc')
-rw-r--r-- | mysql-test/suite/parts/inc/partition_basic_symlink.inc | 159 |
1 files changed, 22 insertions, 137 deletions
diff --git a/mysql-test/suite/parts/inc/partition_basic_symlink.inc b/mysql-test/suite/parts/inc/partition_basic_symlink.inc index 22a61477388..94d48fcaf15 100644 --- a/mysql-test/suite/parts/inc/partition_basic_symlink.inc +++ b/mysql-test/suite/parts/inc/partition_basic_symlink.inc @@ -16,144 +16,29 @@ --enable_abort_on_error --echo ---echo #======================================================================== ---echo # Check partitioning methods on just created tables ---echo # The tables should be defined without/with PRIMARY KEY and ---echo # UNIQUE INDEXes. ---echo # Every test round has to check ---echo # PARTITION BY HASH/KEY/LIST/RANGE ---echo # PARTITION BY RANGE/LIST ... SUBPARTITION BY HASH/KEY ... ---echo #======================================================================== ---echo #------------------------------------------------------------------------ ---echo # 1 Tables without PRIMARY KEY or UNIQUE INDEXes ---echo #------------------------------------------------------------------------ ---echo # 1.1 The partitioning function contains one column. -let $unique= ; ---source suite/parts/inc/partition_methods1.inc -# - --echo # 1.1.1 with DATA DIECTORY/INDEX DIRECTORY - # - --disable_query_log - # DATA DIRECTORY - # Make directory for partition data - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true - eval SET @data_dir = 'DATA DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/data'''''; - let $data_directory = `select @data_dir`; - - #INDEX DIRECTORY - # Make directory for partition index - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true - eval SET @indx_dir = 'INDEX DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/index'''''; - let $index_directory = `select @indx_dir`; - - let $with_directories= 1; - --source suite/parts/inc/partition_methods1.inc - --source suite/parts/inc/partition_directory.inc - let $with_directories= 0; - --enable_query_log - # ---echo # 1.2 The partitioning function contains two columns. let $unique= ; ---source suite/parts/inc/partition_methods2.inc -# ---echo #------------------------------------------------------------------------ ---echo # 2 Tables with PRIMARY KEY and/or UNIQUE INDEXes ---echo # The partitioning function contains one column. ---echo #------------------------------------------------------------------------ -if ($more_pk_ui_tests) -{ - if ($do_pk_tests) - { - --echo # 2.1 PRIMARY KEY consisting of one column - let $unique= , PRIMARY KEY(f_int1); - --source suite/parts/inc/partition_methods1.inc - } - --echo # 2.2 UNIQUE INDEX consisting of one column - let $unique= , UNIQUE INDEX uidx1 (f_int1); - --source suite/parts/inc/partition_methods1.inc - - --echo # 2.2.1 with DATA DIECTORY/INDEX DIRECTORY - # - --disable_query_log - # DATA DIRECTORY - # Make directory for partition data - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true - eval SET @data_dir = 'DATA DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/data'''''; - let $data_directory = `select @data_dir`; - #INDEX DIRECTORY - # Make directory for partition index - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true - eval SET @indx_dir = 'INDEX DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/index'''''; - let $index_directory = `select @indx_dir`; +# DATA DIRECTORY +# Make directory for partition data +let $data_dir_path= $MYSQLTEST_VARDIR/mysql-test-data-dir; +--mkdir $data_dir_path +let $data_directory= DATA DIRECTORY = '$data_dir_path'; - let $with_directories= TRUE; - --source suite/parts/inc/partition_methods1.inc - let $with_directories= FALSE; - --enable_query_log - # - if ($do_pk_tests) - { - --echo # 2.3 PRIMARY KEY consisting of two columns - let $unique= , PRIMARY KEY(f_int1,f_int2); - --source suite/parts/inc/partition_methods1.inc - let $unique= , PRIMARY KEY(f_int2,f_int1); - --source suite/parts/inc/partition_methods1.inc - } - # - --echo # 2.4 UNIQUE INDEX consisting of two columns - let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2); - --source suite/parts/inc/partition_methods1.inc - let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1); - --source suite/parts/inc/partition_methods1.inc - # -} ---echo # 2.5 PRIMARY KEY + UNIQUE INDEX consisting of two columns -if ($do_pk_tests) -{ - let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1); - --source suite/parts/inc/partition_methods1.inc - let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2); - --source suite/parts/inc/partition_methods1.inc -} -let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1); ---source suite/parts/inc/partition_methods1.inc +#INDEX DIRECTORY +# Make directory for partition index +let $idx_dir_path= $MYSQLTEST_VARDIR/mysql-test-idx-dir; +--mkdir $idx_dir_path +let $index_directory= INDEX DIRECTORY = '$idx_dir_path'; ---echo #------------------------------------------------------------------------ ---echo # 3 Tables with PRIMARY KEY and/or UNIQUE INDEXes ---echo # The partitioning function contains two columns. ---echo #------------------------------------------------------------------------ -# -if ($more_pk_ui_tests) -{ - if ($do_pk_tests) - { - --echo # 3.1 PRIMARY KEY consisting of two columns - let $unique= , PRIMARY KEY(f_int1,f_int2); - --source suite/parts/inc/partition_methods2.inc - - let $unique= , PRIMARY KEY(f_int2,f_int1); - --source suite/parts/inc/partition_methods2.inc - } - # - --echo # 3.2 UNIQUE INDEX consisting of two columns - let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2); - --source suite/parts/inc/partition_methods2.inc - let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1); - --source suite/parts/inc/partition_methods2.inc -} -# ---echo # 3.3 PRIMARY KEY and UNIQUE INDEX consisting of two columns -if ($do_pk_tests) -{ - let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1); - --source suite/parts/inc/partition_methods2.inc - let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2); - --source suite/parts/inc/partition_methods2.inc -} -let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1); ---source suite/parts/inc/partition_methods2.inc +let $with_directories= 1; +--echo #======================================================================== +--echo # 0.5 use partition_basic with DATA/INDEX DIRECTORY +--echo #======================================================================== +--source suite/parts/inc/partition_basic.inc +--echo #======================================================================== +--echo # 5 use partition_directory with DATA/INDEX DIRECTORY +--echo #======================================================================== +--source suite/parts/inc/partition_directory.inc +--rmdir $data_dir_path +--rmdir $idx_dir_path +let $with_directories= 0; |