diff options
| author | unknown <kostja@bodhi.local> | 2007-01-16 21:31:59 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-01-16 21:31:59 +0300 |
| commit | 329f6ba1cb360b035bd5e221f86c716aed1cf275 (patch) | |
| tree | 62c3ac0f02a14404d768ea6a77527774e70f9b51 /mysql-test/t/ps.test | |
| parent | 22f62e8a2f529cb5b8996ea3de8659420fe58219 (diff) | |
| parent | 9cff68bb3b2408c8cefccaa230a527cb1a9f955e (diff) | |
| download | mariadb-git-329f6ba1cb360b035bd5e221f86c716aed1cf275.tar.gz | |
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.
Diffstat (limited to 'mysql-test/t/ps.test')
| -rw-r--r-- | mysql-test/t/ps.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 0b7539bfa03..bddf6f57ed1 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -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 |