diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-02-08 13:02:53 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-02-08 13:02:53 +0400 |
| commit | 442aca800fd8d64b88cef5cb57509d8abc56ae3d (patch) | |
| tree | 1406c46c9d43dcd64d792a520a93cc8e49c45910 /mysql-test/t/strict.test | |
| parent | b081cccef7cfebbc24b3203b5f38578920dfa427 (diff) | |
| parent | cc2c4e265a721a7b4ff53907b57256b6c51f8df3 (diff) | |
| download | mariadb-git-442aca800fd8d64b88cef5cb57509d8abc56ae3d.tar.gz | |
Merge mysql.com:/home/ram/work/b25301/b25301.5.0
into mysql.com:/home/ram/work/b25301/b25301.5.1
mysql-test/t/strict.test:
Auto merged
sql-common/my_time.c:
Auto merged
mysql-test/r/date_formats.result:
merging
mysql-test/r/strict.result:
merging
mysql-test/r/type_datetime.result:
merging
Diffstat (limited to 'mysql-test/t/strict.test')
| -rw-r--r-- | mysql-test/t/strict.test | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index 2f35bbf22f2..402208d02cc 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -14,7 +14,6 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 (col1 date); INSERT INTO t1 VALUES('2004-01-01'),('2004-02-29'); ---error 1292 INSERT INTO t1 VALUES('0000-10-31'); # All test cases expected to fail should return @@ -100,7 +99,6 @@ set @@sql_mode='ansi,traditional'; CREATE TABLE t1 (col1 datetime); INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('2004-02-29 15:30:00'); ---error 1292 INSERT INTO t1 VALUES('0000-10-31 15:30:00'); # All test cases expected to fail should return @@ -194,7 +192,6 @@ INSERT INTO t1 (col3) VALUES (STR_TO_DATE('15.10.2004 10.15','%d.%m.%Y %H.%i')); # All test cases expected to fail should return # SQLSTATE 22007 <invalid date value> ---error 1292 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i')); --error 1292 @@ -216,7 +213,6 @@ INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y')); # All test cases expected to fail should return # SQLSTATE 22007 <invalid datetime value> ---error 1292 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i')); --error 1292 @@ -271,7 +267,6 @@ INSERT INTO t1 (col3) VALUES (CAST('2004-10-15 10:15' AS DATETIME)); # All test cases expected to fail should return # SQLSTATE 22007 <invalid date value> ---error 1292 INSERT INTO t1 (col1) VALUES(CAST('0000-10-31' AS DATE)); --error 1292 @@ -299,7 +294,6 @@ INSERT INTO t1 (col1) VALUES(CAST('0000-00-00' AS DATE)); # All test cases expected to fail should return # SQLSTATE 22007 <invalid datetime value> ---error 1292 INSERT INTO t1 (col2) VALUES(CAST('0000-10-31 15:30' AS DATETIME)); --error 1292 @@ -367,7 +361,6 @@ INSERT INTO t1 (col3) VALUES (CONVERT('2004-10-15 10:15',DATETIME)); # All test cases expected to fail should return # SQLSTATE 22007 <invalid date value> ---error 1292 INSERT INTO t1 (col1) VALUES(CONVERT('0000-10-31' , DATE)); --error 1292 @@ -394,7 +387,6 @@ INSERT INTO t1 (col1) VALUES(CONVERT('0000-00-00',DATE)); # All test cases expected to fail should return # SQLSTATE 22007 <invalid datetime value> ---error 1292 INSERT INTO t1 (col2) VALUES(CONVERT('0000-10-31 15:30',DATETIME)); --error 1292 |