diff options
| author | msvensson@neptunus.(none) <> | 2005-09-02 08:59:59 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-09-02 08:59:59 +0200 |
| commit | 345dfef41f785aa584ec5c0c2bc60e6e1e88a972 (patch) | |
| tree | b72639980d52da090b2dd1dc8c17f80abd2b967e /mysql-test/t/strict.test | |
| parent | d636c34689608348e7b01629f8a1b8e7460966f7 (diff) | |
| parent | d0a78f4dcc65c0eae3a0b2a8d43c76b5be5327a3 (diff) | |
| download | mariadb-git-345dfef41f785aa584ec5c0c2bc60e6e1e88a972.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
Diffstat (limited to 'mysql-test/t/strict.test')
| -rw-r--r-- | mysql-test/t/strict.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index ca57ca646f2..6af0a10d831 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -315,7 +315,7 @@ INSERT INTO t1 (col2) VALUES(CAST('0000-00-00' AS DATETIME)); ## Test INSERT with CAST AS DATETIME into TIMESTAMP # All test cases expected to fail should return # SQLSTATE 22007 <invalid datetime value> -!$1292 +--error 1292 INSERT INTO t1 (col3) VALUES(CAST('0000-10-31 15:30' AS DATETIME)); -- should return OK -- We accept this to be a failure @@ -406,7 +406,7 @@ INSERT INTO t1 (col2) VALUES(CONVERT('0000-00-00',DATETIME)); ## Test INSERT with CONVERT to DATETIME into DATETIME # All test cases expected to fail should return # SQLSTATE 22007 <invalid datetime value> -!$1292 +--error 1292 INSERT INTO t1 (col3) VALUES(CONVERT('0000-10-31 15:30',DATETIME)); -- should return OK -- We accept this to be a failure |