Commit 9dfe413a authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/home/ram/work/b25301/b25301.5.0


sql-common/my_time.c:
  Auto merged
parents 9b2e0127 cc2c4e26

mysql-test/r/date_formats.result

+19 −42
Original line number Diff line number Diff line
@@ -186,12 +186,12 @@ date format datetime 
2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	2003-01-02 02:11:12.123450

2003-01-02 12:11:12.12345 am	%Y-%m-%d %h:%i:%S.%f%p	2003-01-02 00:11:12.123450

2003-01-02 11:11:12Pm	%Y-%m-%d %h:%i:%S%p	2003-01-02 23:11:12

10:20:10	%H:%i:%s	0000-00-00 00:00:00

10:20:10	%h:%i:%s.%f	0000-00-00 00:00:00

10:20:10	%T	0000-00-00 00:00:00

10:20:10AM	%h:%i:%s%p	0000-00-00 00:00:00

10:20:10AM	%r	0000-00-00 00:00:00

10:20:10.44AM	%h:%i:%s.%f%p	0000-00-00 00:00:00

10:20:10	%H:%i:%s	0000-00-00 10:20:10

10:20:10	%h:%i:%s.%f	0000-00-00 10:20:10

10:20:10	%T	0000-00-00 10:20:10

10:20:10AM	%h:%i:%s%p	0000-00-00 10:20:10

10:20:10AM	%r	0000-00-00 10:20:10

10:20:10.44AM	%h:%i:%s.%f%p	0000-00-00 10:20:10.440000

15-01-2001 12:59:58	%d-%m-%Y %H:%i:%S	2001-01-15 12:59:58

15 September 2001	%d %M %Y	2001-09-15 00:00:00

15 SEPTEMB 2001	%d %M %Y	2001-09-15 00:00:00
@@ -208,13 +208,6 @@ Tuesday 52 2001 %W %V %X 2002-01-01 00:00:00 
15-01-2001	%d-%m-%Y %H:%i:%S	2001-01-15 00:00:00

15-01-20	%d-%m-%y	2020-01-15 00:00:00

15-2001-1	%d-%Y-%c	2001-01-15 00:00:00

Warnings:

Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:20:10.440000'

select date,format,DATE(str_to_date(date, format)) as date2 from t1;

date	format	date2

2003-01-02 10:11:12	%Y-%m-%d %H:%i:%S	2003-01-02
@@ -255,12 +248,12 @@ date format time 
2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	02:11:12.123450

2003-01-02 12:11:12.12345 am	%Y-%m-%d %h:%i:%S.%f%p	00:11:12.123450

2003-01-02 11:11:12Pm	%Y-%m-%d %h:%i:%S%p	23:11:12

10:20:10	%H:%i:%s	NULL

10:20:10	%h:%i:%s.%f	NULL

10:20:10	%T	NULL

10:20:10AM	%h:%i:%s%p	NULL

10:20:10AM	%r	NULL

10:20:10.44AM	%h:%i:%s.%f%p	NULL

10:20:10	%H:%i:%s	10:20:10

10:20:10	%h:%i:%s.%f	10:20:10

10:20:10	%T	10:20:10

10:20:10AM	%h:%i:%s%p	10:20:10

10:20:10AM	%r	10:20:10

10:20:10.44AM	%h:%i:%s.%f%p	10:20:10.440000

15-01-2001 12:59:58	%d-%m-%Y %H:%i:%S	12:59:58

15 September 2001	%d %M %Y	00:00:00

15 SEPTEMB 2001	%d %M %Y	00:00:00
@@ -277,13 +270,6 @@ Tuesday 52 2001 %W %V %X 00:00:00 
15-01-2001	%d-%m-%Y %H:%i:%S	00:00:00

15-01-20	%d-%m-%y	00:00:00

15-2001-1	%d-%Y-%c	00:00:00

Warnings:

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10.440000'

select date,format,concat(TIME(str_to_date(date, format))) as time2 from t1;

date	format	time2

2003-01-02 10:11:12	%Y-%m-%d %H:%i:%S	10:11:12
@@ -293,12 +279,12 @@ date format time2 
2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	02:11:12.123450

2003-01-02 12:11:12.12345 am	%Y-%m-%d %h:%i:%S.%f%p	00:11:12.123450

2003-01-02 11:11:12Pm	%Y-%m-%d %h:%i:%S%p	23:11:12

10:20:10	%H:%i:%s	NULL

10:20:10	%h:%i:%s.%f	NULL

10:20:10	%T	NULL

10:20:10AM	%h:%i:%s%p	NULL

10:20:10AM	%r	NULL

10:20:10.44AM	%h:%i:%s.%f%p	NULL

10:20:10	%H:%i:%s	10:20:10

10:20:10	%h:%i:%s.%f	10:20:10

10:20:10	%T	10:20:10

10:20:10AM	%h:%i:%s%p	10:20:10

10:20:10AM	%r	10:20:10

10:20:10.44AM	%h:%i:%s.%f%p	10:20:10.440000

15-01-2001 12:59:58	%d-%m-%Y %H:%i:%S	12:59:58

15 September 2001	%d %M %Y	00:00:00

15 SEPTEMB 2001	%d %M %Y	00:00:00
@@ -315,13 +301,6 @@ Tuesday 52 2001 %W %V %X 00:00:00 
15-01-2001	%d-%m-%Y %H:%i:%S	00:00:00

15-01-20	%d-%m-%y	00:00:00

15-2001-1	%d-%Y-%c	00:00:00

Warnings:

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10'

Warning	1292	Truncated incorrect time value: '0000-00-00 10:20:10.440000'

select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d'));

concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d'))

2003-01-02 08:11:02.123456
@@ -470,8 +449,6 @@ create table t1 select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:% 
str_to_date("10:11:12.0012", "%H:%i:%S.%f") as f2,

str_to_date("2003-01-02", "%Y-%m-%d") as f3,

str_to_date("02", "%d") as f4, str_to_date("02 10", "%d %H") as f5;

Warnings:

Warning	1265	Data truncated for column 'f4' at row 1

describe t1;

Field	Type	Null	Key	Default	Extra

f1	datetime	YES		NULL
@@ -481,7 +458,7 @@ f4 date YES NULL 
f5	time	YES		NULL	

select * from t1;

f1	f2	f3	f4	f5

2003-01-02 10:11:12	10:11:12	2003-01-02	0000-00-00	58:00:00

2003-01-02 10:11:12	10:11:12	2003-01-02	0000-00-02	58:00:00

drop table t1;

create table t1 select "02 10" as a, "%d %H" as b;

select str_to_date(a,b) from t1;

mysql-test/r/strict.result

+4 −10
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ DROP TABLE IF EXISTS t1; 
CREATE TABLE t1 (col1 date);

INSERT INTO t1 VALUES('2004-01-01'),('2004-02-29');

INSERT INTO t1 VALUES('0000-10-31');

ERROR 22007: Incorrect date value: '0000-10-31' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-0-31');

ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-01-02'),('2004-0-31');
@@ -57,6 +56,7 @@ select * from t1; 
col1

2004-01-01

2004-02-29

0000-10-31

2004-01-02

2004-01-03

2004-00-31
@@ -124,7 +124,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');

INSERT INTO t1 VALUES('0000-10-31 15:30:00');

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-0-31 15:30:00');

ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-10-0 15:30:00');
@@ -145,6 +144,7 @@ select * from t1; 
col1

2004-10-31 15:30:00

2004-02-29 15:30:00

0000-10-31 15:30:00

drop table t1;

CREATE TABLE t1 (col1 timestamp);

INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('2004-02-29 15:30:00');
@@ -206,7 +206,6 @@ INSERT INTO t1 (col1) VALUES (STR_TO_DATE('15.10.2004','%d.%m.%Y')); 
INSERT INTO t1 (col2) VALUES (STR_TO_DATE('15.10.2004 10.15','%d.%m.%Y %H.%i'));

INSERT INTO t1 (col3) VALUES (STR_TO_DATE('15.10.2004 10.15','%d.%m.%Y %H.%i'));

INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));

ERROR 22007: Incorrect date value: '0000-10-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));

ERROR 22007: Incorrect date value: '2004-00-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
@@ -222,7 +221,6 @@ ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_ti 
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'));

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));

ERROR 22007: Incorrect datetime value: '2004-00-31 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
@@ -259,7 +257,6 @@ INSERT INTO t1 (col1) VALUES (CAST('2004-10-15' AS DATE)); 
INSERT INTO t1 (col2) VALUES (CAST('2004-10-15 10:15' AS DATETIME));

INSERT INTO t1 (col3) VALUES (CAST('2004-10-15 10:15' AS DATETIME));

INSERT INTO t1 (col1) VALUES(CAST('0000-10-31' AS DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31'

INSERT INTO t1 (col1) VALUES(CAST('2004-10-0' AS DATE));

ERROR 22007: Incorrect date value: '2004-10-00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(CAST('2004-0-10' AS DATE));
@@ -267,7 +264,6 @@ ERROR 22007: Incorrect date value: '2004-00-10' for column 'col1' at row 1 
INSERT INTO t1 (col1) VALUES(CAST('0000-00-00' AS DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col2) VALUES(CAST('0000-10-31 15:30' AS DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

INSERT INTO t1 (col2) VALUES(CAST('2004-10-0 15:30' AS DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
@@ -275,7 +271,7 @@ ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col2' a 
INSERT INTO t1 (col2) VALUES(CAST('0000-00-00' AS DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col3) VALUES(CAST('0000-10-31 15:30' AS DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1

INSERT INTO t1 (col3) VALUES(CAST('2004-10-0 15:30' AS DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col3' at row 1

INSERT INTO t1 (col3) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
@@ -288,7 +284,6 @@ INSERT INTO t1 (col1) VALUES (CONVERT('2004-10-15',DATE)); 
INSERT INTO t1 (col2) VALUES (CONVERT('2004-10-15 10:15',DATETIME));

INSERT INTO t1 (col3) VALUES (CONVERT('2004-10-15 10:15',DATETIME));

INSERT INTO t1 (col1) VALUES(CONVERT('0000-10-31' , DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31'

INSERT INTO t1 (col1) VALUES(CONVERT('2004-10-0' , DATE));

ERROR 22007: Incorrect date value: '2004-10-00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(CONVERT('2004-0-10' , DATE));
@@ -296,7 +291,6 @@ ERROR 22007: Incorrect date value: '2004-00-10' for column 'col1' at row 1 
INSERT INTO t1 (col1) VALUES(CONVERT('0000-00-00',DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col2) VALUES(CONVERT('0000-10-31 15:30',DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

INSERT INTO t1 (col2) VALUES(CONVERT('2004-10-0 15:30',DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
@@ -304,7 +298,7 @@ ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col2' a 
INSERT INTO t1 (col2) VALUES(CONVERT('0000-00-00',DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col3) VALUES(CONVERT('0000-10-31 15:30',DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1

INSERT INTO t1 (col3) VALUES(CONVERT('2004-10-0 15:30',DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col3' at row 1

INSERT INTO t1 (col3) VALUES(CONVERT('2004-0-10 15:30',DATETIME));

mysql-test/r/type_datetime.result

+1 −3
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ Table Op Msg_type Msg_text 
test.t1	check	status	OK

delete from t1;

insert into t1 values("000101"),("691231"),("700101"),("991231"),("00000101"),("00010101"),("99991231"),("00101000000"),("691231000000"),("700101000000"),("991231235959"),("10000101000000"),("99991231235959"),("20030100000000"),("20030000000000");

Warnings:

Warning	1264	Out of range value adjusted for column 't' at row 5

insert into t1 values ("2003-003-03");

insert into t1 values ("20030102T131415"),("2001-01-01T01:01:01"), ("2001-1-1T1:01:01");

select * from t1;
@@ -36,7 +34,7 @@ t 
2069-12-31 00:00:00

1970-01-01 00:00:00

1999-12-31 00:00:00

0000-00-00 00:00:00

0000-01-01 00:00:00

0001-01-01 00:00:00

9999-12-31 00:00:00

2000-10-10 00:00:00

mysql-test/t/strict.test

+0 −8
Original line number Diff line number Diff line
@@ -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

sql-common/my_time.c

+2 −5
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, 
        (!(flags & TIME_INVALID_DATES) &&

         ltime->month && ltime->day > days_in_month[ltime->month-1] &&

         (ltime->month != 2 || calc_days_in_year(ltime->year) != 366 ||

          ltime->day != 29)) ||

        (ltime->year == 0 && (ltime->month != 0 || ltime->day != 0)))

          ltime->day != 29)))

    {

      *was_cut= 2;

      return TRUE;
@@ -410,9 +409,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, 
  if (number_of_fields < 3 ||

      l_time->year > 9999 || l_time->month > 12 ||

      l_time->day > 31 || l_time->hour > 23 ||

      l_time->minute > 59 || l_time->second > 59 ||

      (l_time->year == 0 && l_time->month == 0 && l_time->day == 0 && 

       (l_time->hour != 0 || l_time->minute != 0 || l_time->second != 0)))

      l_time->minute > 59 || l_time->second > 59)

  {

    /* Only give warning for a zero date if there is some garbage after */

    if (!not_zero_date)                         /* If zero date */