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

Merge bodhi.local:/opt/local/work/mysql-4.1-runtime

Browse Source 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Manual merge.
This commit is contained in:
unknown 2007-01-16 21:31:59 +03:00
commit 329f6ba1cb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/t/ps.test
View File

@ -1165,7 +1165,12 @@ show create table mysqltest.t2;
drop database mysqltest; drop database mysqltest;
deallocate prepare stmt1; deallocate prepare stmt1;
deallocate prepare stmt2; deallocate prepare stmt2;
#
# CREATE TABLE with DATA DIRECTORY option # 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_query_log --disable_query_log
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'"; eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
--enable_query_log --enable_query_log