1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from latest 5.5

Browse Source
This commit is contained in:
Guilhem Bichot 2011-04-26 13:26:41 +02:00
commit 85f6ec594a
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/parts/inc/partition_check_drop.inc
View File

@ -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)
{ {

3
mysql-test/suite/parts/inc/partition_layout_check1.inc
View File

@ -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)
{ {

3
mysql-test/suite/parts/inc/partition_layout_check2.inc
View File

@ -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)
{ {