1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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

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

View File

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