diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-02 00:57:25 +0200 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-02 00:57:25 +0200 |
| commit | 5697c0c10ceeace7e14f47dd6e9c2d2e0552e78b (patch) | |
| tree | 5339c6747631cb919dd972d0b8a25a0958bceba5 /mysql-test/t/strict.test | |
| parent | 865f294fcfe14bf69a85eb8ba1260b7a4af45d7d (diff) | |
| parent | e21076463c4c1721bfd7150ff2350d634009755a (diff) | |
| download | mariadb-git-5697c0c10ceeace7e14f47dd6e9c2d2e0552e78b.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/subselect3.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Manual merge
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; |