Skip to content

M
MariaDB
Commit 85f6ec59 authored by Guilhem Bichot's avatar Guilhem Bichot
Browse files
Options

merge from latest 5.5

parents 3c894df5 c43f804c
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
mysql-test/suite/parts/inc/partition_check_drop.inc
View file @ 85f6ec59
...@@ -37,7 +37,7 @@ if ($do_file_tests) ...@@ -37,7 +37,7 @@ if ($do_file_tests)
eval SET @aux = load_file('$ls_file'); eval SET @aux = load_file('$ls_file');
# clean up # clean up
remove_file $ls_file; --remove_file $ls_file
} }
if (!$do_file_tests) if (!$do_file_tests)
{ {
......
mysql-test/suite/parts/inc/partition_layout_check1.inc
View file @ 85f6ec59
...@@ -45,6 +45,9 @@ if ($do_file_tests) ...@@ -45,6 +45,9 @@ if ($do_file_tests)
--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1* --list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1*
} }
eval SET @aux = load_file('$ls_file'); eval SET @aux = load_file('$ls_file');
# clean up
--remove_file $ls_file
} }
if (!$do_file_tests) if (!$do_file_tests)
{ {
......
mysql-test/suite/parts/inc/partition_layout_check2.inc
View file @ 85f6ec59
...@@ -43,6 +43,9 @@ if ($do_file_tests) ...@@ -43,6 +43,9 @@ if ($do_file_tests)
--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1* --list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1*
} }
eval SET @aux = load_file('$ls_file'); eval SET @aux = load_file('$ls_file');
# clean up
--remove_file $ls_file
} }
if (!$do_file_tests) if (!$do_file_tests)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7