diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:01:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:01:23 +0200 |
| commit | e2965fb2628c9d4e557d755eeca0bc24b43fb353 (patch) | |
| tree | d05f731fdf5db3f807667cbb59f41f497da23ead /mysql-test/t/strict.test | |
| parent | 7bc1d892038f170f90448a08292153bc2456f504 (diff) | |
| download | mariadb-git-e2965fb2628c9d4e557d755eeca0bc24b43fb353.tar.gz | |
mysqltest improvements, updates after merge + test for 5.0
client/mysqltest.c:
Fixes after merge
mysql-test/r/type_newdecimal.result:
Update results after correction of testcase
mysql-test/t/flush_read_lock_kill.test:
Found extra delimiter
mysql-test/t/kill.test:
Found extra delimiter
mysql-test/t/rpl_loaddata.test:
Found extra delimiter
mysql-test/t/rpl_sp.test:
Found extra delimiter
mysql-test/t/strict.test:
Convert "!$1292" to "--error 1292"
mysql-test/t/type_newdecimal.test:
Missing ;
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 302acc9bef2..20f0b072bfd 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 |