Commit 212ecf34 authored by unknown's avatar unknown
Browse files

Removed not used define YY_MAGIC_BELOW 

Made year 2000 handling more uniform
Removed year 2000 handling out from calc_days()
The above removes some bugs in date/datetimes with year between 0 and 200
Now we get a note when we insert a datetime value into a date column
For default values to CREATE, don't give errors for warning level NOTE
Fixed some compiler failures
Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
Removed duplicate typedef TIME and replaced it with MYSQL_TIME

Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"


include/my_time.h:
  Removed not used define YY_MAGIC_BELOW
  Added prototype for year_2000_handling()
mysql-test/r/date_formats.result:
  Updated results (fixed bug in date_format() with year < 99)
mysql-test/r/func_sapdb.result:
  Added more testing of make_date()
mysql-test/r/func_time.result:
  Fixed bug in date_sub() with years < 200
mysql-test/r/ps_2myisam.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_3innodb.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_4heap.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_5merge.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/ps_7ndb.result:
  Now we get a note when we insert a datetime value into a date column
mysql-test/r/type_date.result:
  Added test for date conversions
mysql-test/r/type_datetime.result:
  Added testcase for datetime to date conversion.
mysql-test/t/date_formats.test:
  Added testing of dates < 200
mysql-test/t/func_sapdb.test:
  More testing of makedate()
mysql-test/t/type_date.test:
  Added test for date conversions
mysql-test/t/type_datetime.test:
  Added testcase for datetime to date conversion.
sql/CMakeLists.txt:
  Added library ws2_32 (needed if we want to compile with IOCP support)
sql/event_data_objects.cc:
  TIME -> MYSQL_TIME
sql/event_db_repository.cc:
  TIME -> MYSQL_TIME
sql/event_queue.cc:
  TIME -> MYSQL_TIME
sql/field.cc:
  Give note if we insert a datetime value in a date field
  Don't give notes if we are doing internal test conversions (like from convert_constant_item())
  More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
  Revert some changes in Field_newdate::store() to get more optimal code
  Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
  New parameters to make_truncated_value_warning()
sql/field.h:
  TIME -> MYSQL_TIME
sql/item.cc:
  New parameters to make_truncated_value_warning()
  Fixed get_date() to call number_to_datetime() if argument is not a string.
  Fixes Bug#23093 Implicit conversion of 9912101 to date does not match cast(9912101 as date)
sql/item.h:
  TIME -> MYSQL_TIME
sql/item_cmpfunc.cc:
  Don't print notes in convert_constant_item()
sql/item_func.h:
  TIME -> MYSQL_TIME
sql/item_timefunc.cc:
  New parameters to make_truncated_value_warning()
  Moved year 2000 handling out from calc_days()
  Don't return NULL for years < 200 in date_add/date_sub
sql/item_timefunc.h:
  TIME -> MYSQL_TIME
sql/my_decimal.cc:
  TIME -> MYSQL_TIME
sql/my_decimal.h:
  TIME -> MYSQL_TIME
sql/mysql_priv.h:
  Added error level to make_truncated_value_warning()
sql/protocol.cc:
  TIME -> MYSQL_TIME
sql/protocol.h:
  TIME -> MYSQL_TIME
sql/sp.cc:
  TIME -> MYSQL_TIME
sql/sql_base.cc:
  Make testing of result value of save_in_field() uniform
sql-common/my_time.c:
  Added year_2000_handling()
  Removed year 2000 handling from calc_daynr()
sql/sql_class.h:
  TIME -> MYSQL_TIME
sql/sql_show.cc:
  TIME -> MYSQL_TIME
sql/structs.h:
  TIME -> MYSQL_TIME
sql/time.cc:
  Added error level to make_truncated_value_warning()
sql/tztime.cc:
  TIME -> MYSQL_TIME
sql/tztime.h:
  TIME -> MYSQL_TIME
sql/unireg.cc:
  For default values to CREATE, don't give errors for warning level NOTE
  (Fixed failed CREATE when we give a datetime value to a date field)
strings/ctype-utf8.c:
  Fixed compiler failures
win/README:
  More comments
parent a79e08a6

include/my_time.h

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ typedef long my_time_t; 


/* two-digit years < this are 20..; >= this are 19.. */

#define YY_PART_YEAR	   70

/* apply above magic to years < this */

#define YY_MAGIC_BELOW     200



/* Flags to str_to_datetime */

#define TIME_FUZZY_DATE		1
@@ -93,6 +91,7 @@ int check_time_range(struct st_mysql_time *, int *warning); 


long calc_daynr(uint year,uint month,uint day);

uint calc_days_in_year(uint year);

uint year_2000_handling(uint year);



void init_time(void);

mysql-test/r/date_formats.result

+16 −2
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ create table t1 (date char(30), format char(30) not null); 
insert into t1 values

('2003-01-02 10:11:12', '%Y-%m-%d %H:%i:%S'),

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

('0003-01-02 8:11:2.123456', '%Y-%m-%d %H:%i:%S.%#'),

('03-01-02 8:11:2.123456',   '%Y-%m-%d %H:%i:%S.%#'),

('2003-01-02 10:11:12 PM', '%Y-%m-%d %h:%i:%S %p'),

('2003-01-02 01:11:12.12345AM', '%Y-%m-%d %h:%i:%S.%f%p'),

('2003-01-02 02:11:12.12345AM', '%Y-%m-%d %h:%i:%S.%f %p'),
@@ -122,6 +124,8 @@ select date,format,str_to_date(date, format) as str_to_date from t1; 
date	format	str_to_date

2003-01-02 10:11:12	%Y-%m-%d %H:%i:%S	2003-01-02 10:11:12

03-01-02 8:11:2.123456	%y-%m-%d %H:%i:%S.%#	2003-01-02 08:11:02

0003-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	0003-01-02 08:11:02

03-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	2003-01-02 08:11:02

2003-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	2003-01-02 22:11:12

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

2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	2003-01-02 02:11:12.123450
@@ -153,6 +157,8 @@ select date,format,concat('',str_to_date(date, format)) as con from t1; 
date	format	con

2003-01-02 10:11:12	%Y-%m-%d %H:%i:%S	2003-01-02 10:11:12

03-01-02 8:11:2.123456	%y-%m-%d %H:%i:%S.%#	2003-01-02 08:11:02

0003-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	0003-01-02 08:11:02

03-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	2003-01-02 08:11:02

2003-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	2003-01-02 22:11:12

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

2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	2003-01-02 02:11:12.123450
@@ -184,6 +190,8 @@ select date,format,cast(str_to_date(date, format) as datetime) as datetime from 
date	format	datetime

2003-01-02 10:11:12	%Y-%m-%d %H:%i:%S	2003-01-02 10:11:12

03-01-02 8:11:2.123456	%y-%m-%d %H:%i:%S.%#	2003-01-02 08:11:02

0003-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	0003-01-02 08:11:02

03-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	2003-01-02 08:11:02

2003-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	2003-01-02 22:11:12

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

2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	2003-01-02 02:11:12.123450
@@ -222,6 +230,8 @@ 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

03-01-02 8:11:2.123456	%y-%m-%d %H:%i:%S.%#	2003-01-02

0003-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	0003-01-02

03-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	2003-01-02

2003-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	2003-01-02

2003-01-02 01:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f%p	2003-01-02

2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	2003-01-02
@@ -253,6 +263,8 @@ select date,format,TIME(str_to_date(date, format)) as time from t1; 
date	format	time

2003-01-02 10:11:12	%Y-%m-%d %H:%i:%S	10:11:12

03-01-02 8:11:2.123456	%y-%m-%d %H:%i:%S.%#	08:11:02

0003-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	08:11:02

03-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	08:11:02

2003-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	22:11:12

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

2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	02:11:12.123450
@@ -291,6 +303,8 @@ 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

03-01-02 8:11:2.123456	%y-%m-%d %H:%i:%S.%#	08:11:02

0003-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	08:11:02

03-01-02 8:11:2.123456	%Y-%m-%d %H:%i:%S.%#	08:11:02

2003-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	22:11:12

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

2003-01-02 02:11:12.12345AM	%Y-%m-%d %h:%i:%S.%f %p	02:11:12.123450
@@ -423,14 +437,14 @@ select date,format,str_to_date(date, format) as str_to_date from t1; 
date	format	str_to_date

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

2003-01-02 10:11:12	%Y-%m-%d %h:%i:%S	2003-01-02 10:11:12

03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	0003-01-02 22:11:12

03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	2003-01-02 22:11:12

Warnings:

Warning	1292	Incorrect datetime value: '10:20:10AM'

select date,format,concat(str_to_date(date, format),'') as con from t1;

date	format	con

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

2003-01-02 10:11:12	%Y-%m-%d %h:%i:%S	2003-01-02 10:11:12

03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	0003-01-02 22:11:12

03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	2003-01-02 22:11:12

Warnings:

Warning	1292	Incorrect datetime value: '10:20:10AM'

drop table t1;

mysql-test/r/func_sapdb.result

+6 −0
Original line number Diff line number Diff line
@@ -75,6 +75,12 @@ NULL 
select weekofyear("1997-11-30 23:59:59.000001");

weekofyear("1997-11-30 23:59:59.000001")

48

select makedate(03,1);

makedate(03,1)

2003-01-01

select makedate('0003',1);

makedate('0003',1)

2003-01-01

select makedate(1997,1);

makedate(1997,1)

1997-01-01

mysql-test/r/func_time.result

+5 −5
Original line number Diff line number Diff line
@@ -1225,13 +1225,13 @@ TIME_FORMAT(SEC_TO_TIME(a),"%H:%i:%s") 
End of 5.0 tests

select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND);

date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND)

NULL

0049-12-31 23:59:59

select date_sub("0199-01-01 00:00:01",INTERVAL 2 SECOND);

date_sub("0199-01-01 00:00:01",INTERVAL 2 SECOND)

NULL

0198-12-31 23:59:59

select date_add("0199-12-31 23:59:59",INTERVAL 2 SECOND);

date_add("0199-12-31 23:59:59",INTERVAL 2 SECOND)

NULL

0200-01-01 00:00:01

select date_sub("0200-01-01 00:00:01",INTERVAL 2 SECOND);

date_sub("0200-01-01 00:00:01",INTERVAL 2 SECOND)

0199-12-31 23:59:59
@@ -1252,8 +1252,8 @@ date_sub("90-01-01 00:00:01",INTERVAL 2 SECOND) 
1989-12-31 23:59:59

select date_sub("0069-01-01 00:00:01",INTERVAL 2 SECOND);

date_sub("0069-01-01 00:00:01",INTERVAL 2 SECOND)

NULL

0068-12-31 23:59:59

select date_sub("0169-01-01 00:00:01",INTERVAL 2 SECOND);

date_sub("0169-01-01 00:00:01",INTERVAL 2 SECOND)

NULL

0168-12-31 23:59:59

End of 5.1 tests

mysql-test/r/ps_2myisam.result

+7 −0
Original line number Diff line number Diff line
@@ -2961,20 +2961,26 @@ delete from t9 ; 
test_sequence

-- insert into date/time columns --

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

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

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

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

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

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

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

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

Warnings:

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

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

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

Warnings:

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

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

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

Warnings:

Warning	1264	Out of range value for column 'c13' at row 1
@@ -3005,6 +3011,7 @@ Warning 1265 Data truncated for column 'c15' at row 1 
Warning	1264	Out of range value for column 'c16' at row 1

Warning	1264	Out of range value for column 'c17' at row 1

Warnings:

Note	1265	Data truncated for column 'c13' at row 1

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

Warning	1264	Out of range value for column 'c16' at row 1

Warning	1264	Out of range value for column 'c17' at row 1