summaryrefslogtreecommitdiff
path: root/mysql-test/t/strict.test
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-09-01 17:01:23 +0200
committermsvensson@neptunus.(none) <>2005-09-01 17:01:23 +0200
commit4b47ebcfc9b80fad19ae844b4c67a13ca4af0830 (patch)
treed05f731fdf5db3f807667cbb59f41f497da23ead /mysql-test/t/strict.test
parent61be2a143d509f4c0e1c5b81ac223a114ad8837f (diff)
downloadmariadb-git-4b47ebcfc9b80fad19ae844b4c67a13ca4af0830.tar.gz
mysqltest improvements, updates after merge + test for 5.0
Diffstat (limited to 'mysql-test/t/strict.test')
-rw-r--r--mysql-test/t/strict.test4
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