mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
Bug#34225: test suit parts uses /tmp-dir
Since it used /tmp-dir, it continues to fail on the same server until the /tmp-dir is cleaned. (Another problem was that it uses DATA/INDEX DIR without checking for symlink, which is needed) Solution: Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file and use this for myisam and innodb, also requiring symlinks and not_windows. (i.e. removed DATA/INDEX DIR use from several tests)
This commit is contained in:
@@ -30,29 +30,6 @@
|
||||
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
|
||||
@@ -72,28 +49,6 @@ if ($more_pk_ui_tests)
|
||||
--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`;
|
||||
|
||||
let $with_directories= TRUE;
|
||||
--source suite/parts/inc/partition_methods1.inc
|
||||
let $with_directories= FALSE;
|
||||
--enable_query_log
|
||||
#
|
||||
if ($do_pk_tests)
|
||||
{
|
||||
|
Reference in New Issue
Block a user