diff options
| author | unknown <kostja@bodhi.(none)> | 2007-06-01 20:06:13 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-06-01 20:06:13 +0400 |
| commit | 0484d44eebff70ef5a2c328c7a9d50ac07a89409 (patch) | |
| tree | 3ab7a7c92bcb7bdb6e975b363dbc04919e6e459e /mysql-test/t/strict.test | |
| parent | 3df461e5e1b1b3f88940878ceab0cb35e8da4812 (diff) | |
| parent | e21076463c4c1721bfd7150ff2350d634009755a (diff) | |
| download | mariadb-git-0484d44eebff70ef5a2c328c7a9d50ac07a89409.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
Diffstat (limited to 'mysql-test/t/strict.test')
| -rw-r--r-- | mysql-test/t/strict.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index bf49a6a906c..2b71bf1093c 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -975,9 +975,7 @@ select * from t1; # Check that select don't abort even in strict mode (for now) set sql_mode='traditional'; ---disable_ps_warnings select count(*) from t1 where STR_TO_DATE('2004.12.12 10:22:61','%Y.%m.%d %T') IS NULL; ---enable_ps_warnings drop table t1; |