diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-18 22:09:15 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-18 22:09:15 +0500 |
commit | 8b33c41554b1f9ac173a047f55fa0c522f28af35 (patch) | |
tree | e58a3f523f5e03fb592555596ca6babae37b02b4 /mysql-test/t/strict.test | |
parent | 5f66ebe8b7ad935049ce2b2d31e48c942452895b (diff) | |
parent | 8933c18cca395edc6bbdb0f29674ceab45ff53b1 (diff) | |
download | mariadb-git-8b33c41554b1f9ac173a047f55fa0c522f28af35.tar.gz |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/strict.test')
-rw-r--r-- | mysql-test/t/strict.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index faca9e7b080..fc663853174 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -7,7 +7,7 @@ set @@sql_mode='ansi,traditional'; select @@sql_mode; --disable_warnings -DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t1, t2; --enable_warnings # Test INSERT with DATE |