Correct test result file for bug #27014

1 files changed, 15 insertions, 52 deletions

diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index c1dccd53035..fc7170bfc2b 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -215,11 +215,11 @@ ERROR 22007: Incorrect date value: '2004-10-00 15:30:00' for column 'col1' at ro
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR 22007: Incorrect date value: '2004-09-31 15:30:00' for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_time
+ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
 ERROR 22007: Incorrect date value: '2003-02-29 15:30:00' for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_time
+ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
 ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
@@ -230,11 +230,11 @@ ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col2' a
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_time
+ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
 ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_time
+ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
 ERROR 22007: Incorrect datetime value: '0000-00-00' for column 'col2' at row 1
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
@@ -246,11 +246,11 @@ ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col3' a
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col3' at row 1
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_time
+ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
 ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col3' at row 1
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_time
+ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
 ERROR 22007: Incorrect datetime value: '0000-00-00' for column 'col3' at row 1
 drop table t1;
@@ -1070,24 +1070,24 @@ create table t1 (col1 datetime);
 insert into t1 values(STR_TO_DATE('31.10.2004 15.30 abc','%d.%m.%Y %H.%i'));
 ERROR 22007: Truncated incorrect datetime value: '31.10.2004 15.30 abc'
 insert into t1 values(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_time
+ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 insert into t1 values(STR_TO_DATE('2004.12.12 22:22:33 AM','%Y.%m.%d %r'));
-ERROR HY000: Incorrect time value: '22:22:33 AM' for function str_to_time
+ERROR HY000: Incorrect time value: '22:22:33 AM' for function str_to_date
 insert into t1 values(STR_TO_DATE('2004.12.12 abc','%Y.%m.%d %T'));
-ERROR HY000: Incorrect time value: 'abc' for function str_to_time
+ERROR HY000: Incorrect time value: 'abc' for function str_to_date
 set sql_mode='';
 insert into t1 values(STR_TO_DATE('31.10.2004 15.30 abc','%d.%m.%Y %H.%i'));
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '31.10.2004 15.30 abc'
 insert into t1 values(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 Warnings:
-Error	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_time
+Error	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 insert into t1 values(STR_TO_DATE('2004.12.12 22:22:33 AM','%Y.%m.%d %r'));
 Warnings:
-Error	1411	Incorrect time value: '22:22:33 AM' for function str_to_time
+Error	1411	Incorrect time value: '22:22:33 AM' for function str_to_date
 insert into t1 values(STR_TO_DATE('2004.12.12 abc','%Y.%m.%d %T'));
 Warnings:
-Error	1411	Incorrect time value: 'abc' for function str_to_time
+Error	1411	Incorrect time value: 'abc' for function str_to_date
 insert into t1 values(STR_TO_DATE('31.10.2004 15.30','%d.%m.%Y %H.%i'));
 insert into t1 values(STR_TO_DATE('2004.12.12 11:22:33 AM','%Y.%m.%d %r'));
 insert into t1 values(STR_TO_DATE('2004.12.12 10:22:59','%Y.%m.%d %T'));
@@ -1105,9 +1105,9 @@ select count(*) from t1 where STR_TO_DATE('2004.12.12 10:22:61','%Y.%m.%d %T') I
 count(*)
 7
 Warnings:
-Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
-Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
-Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time
+Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
+Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
+Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
 drop table t1;
 create table t1 (col1 char(3), col2 integer);
 insert into t1 (col1) values (cast(1000 as char(3)));
@@ -1302,43 +1302,6 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t2,t1;
 set @@sql_mode= @org_mode;
-set @@sql_mode='traditional';
-create table t1 (i int)
-comment '123456789*123456789*123456789*123456789*123456789*
-         123456789*123456789*123456789*123456789*123456789*';
-ERROR HY000: Too long comment for table 't1'
-create table t1 (
-i int comment
-'123456789*123456789*123456789*123456789*
- 123456789*123456789*123456789*123456789*
- 123456789*123456789*123456789*123456789*
- 123456789*123456789*123456789*123456789*
- 123456789*123456789*123456789*123456789*
- 123456789*123456789*123456789*123456789*
- 123456789*123456789*123456789*123456789*');
-ERROR HY000: Too long comment for field 'i'
-set @@sql_mode= @org_mode;
-create table t1
-(i int comment
-'123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*');
-Warnings:
-Warning	1105	Unknown error
-select column_name, column_comment from information_schema.columns where
-table_schema = 'test' and table_name = 't1';
-column_name	column_comment
-i	123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-  123456789*123456789*123456789*123456789*
-drop table t1;
 set names utf8;
 create table t1 (i int)
 comment '123456789*123456789*123456789*123456789*123456789*123456789*';