Commit 329f6ba1 authored by unknown's avatar unknown
Browse files

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.
parents 22f62e8a 9cff68bb

mysql-test/t/ps.test

+5 −0
Original line number Diff line number Diff line
@@ -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