mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

Browse source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
This commit is contained in:
unknown 2007-08-29 12:47:28 +02:00
commit 024bd2f612
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mysql-test/t/backup.test
View file

@ -57,7 +57,16 @@ unlock tables;
connection con1;
reap;
drop table t5;
--system rm $MYSQLTEST_VARDIR/tmp/t?.*
remove_file $MYSQLTEST_VARDIR/tmp/t1.MYD;
remove_file $MYSQLTEST_VARDIR/tmp/t2.MYD;
remove_file $MYSQLTEST_VARDIR/tmp/t3.MYD;
remove_file $MYSQLTEST_VARDIR/tmp/t4.MYD;
remove_file $MYSQLTEST_VARDIR/tmp/t5.MYD;
remove_file $MYSQLTEST_VARDIR/tmp/t1.frm;
remove_file $MYSQLTEST_VARDIR/tmp/t2.frm;
remove_file $MYSQLTEST_VARDIR/tmp/t3.frm;
remove_file $MYSQLTEST_VARDIR/tmp/t4.frm;
remove_file $MYSQLTEST_VARDIR/tmp/t5.frm;
# End of 4.1 tests
# End of 5.0 tests

3
mysql-test/t/ps.test
View file

@ -1181,9 +1181,6 @@ deallocate prepare stmt2;
#
# CREATE TABLE with DATA DIRECTORY option
#
# Protect ourselves from data left in tmp/ by a previos possibly failed
# test
--system rm -f $MYSQLTEST_VARDIR/tmp/t1.*
--disable_warnings
--disable_query_log
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";