summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-01-19 08:56:33 -0500
committerunknown <cmiller@zippy.cornsilk.net>2007-01-19 08:56:33 -0500
commit636a5b3fa44bba47c3420a71809da13ebb3cc15b (patch)
treeb067c6c5c5945b49b7f0eb218fe792f28cd857d0 /mysql-test
parent0c10457ec4a340337ae0a240b4821216dad76bbe (diff)
parentdf1b8242624e1d9ba82a09abc3152643c165897a (diff)
downloadmariadb-git-636a5b3fa44bba47c3420a71809da13ebb3cc15b.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/ps.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 5f00aa60b11..bac7357b163 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -1172,7 +1172,9 @@ deallocate prepare stmt2;
# test
--system rm -f $MYSQLTEST_VARDIR/tmp/t1.*
--disable_query_log
+--disable_warnings
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
+--enable_warnings
--enable_query_log
execute stmt;
#