database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-17634 Regression: TIME(0)=TIME('z') returns NULL vs 1

Browse Source
This commit is contained in:
Alexander Barkov
2018-11-07 14:42:36 +04:00
parent 41e68e8e5b
commit a5e2a14ef3
4 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/main/type_time.result
View File

@ -2094,5 +2094,28 @@ SELECT TIME(99991231235957), TIME(99991231235958), TIME(99991231235959);
TIME(99991231235957) TIME(99991231235958) TIME(99991231235959)
23:59:57 23:59:58 23:59:59
#
# MDEV-17634 Regression: TIME(0)=TIME('z') returns NULL vs 1
#
SELECT
TIMESTAMP(0)=TIMESTAMP('z') AS ts,
DATE(0)=DATE('z') AS d,
TIME(0)=TIME('z') AS t;
ts d t
1 1 1
Warnings:
Warning 1292 Incorrect datetime value: 'z'
Warning 1292 Incorrect datetime value: 'z'
Warning 1292 Truncated incorrect time value: 'z'
SELECT
TIMESTAMP(0)=TIMESTAMP('') AS ts,
DATE(0)=DATE('') AS d,
TIME(0)=TIME('') AS t;
ts d t
1 1 1
Warnings:
Warning 1292 Incorrect datetime value: ''
Warning 1292 Incorrect datetime value: ''
Warning 1292 Truncated incorrect time value: ''
#
# End of 10.4 tests
#

12
mysql-test/main/type_time.test
View File

@ -1366,6 +1366,18 @@ SET optimizer_use_condition_selectivity=DEFAULT;
--echo #
SELECT TIME(99991231235957), TIME(99991231235958), TIME(99991231235959);
--echo #
--echo # MDEV-17634 Regression: TIME(0)=TIME('z') returns NULL vs 1
--echo #
SELECT
TIMESTAMP(0)=TIMESTAMP('z') AS ts,
DATE(0)=DATE('z') AS d,
TIME(0)=TIME('z') AS t;
SELECT
TIMESTAMP(0)=TIMESTAMP('') AS ts,
DATE(0)=DATE('') AS d,
TIME(0)=TIME('') AS t;
--echo #
--echo # End of 10.4 tests

4
sql/item_timefunc.cc
View File

@ -2416,9 +2416,9 @@ void Item_char_typecast::fix_length_and_dec_internal(CHARSET_INFO *from_cs)
}
bool Item_time_typecast::get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
bool Item_time_typecast::get_date(THD *thd, MYSQL_TIME *to, date_mode_t mode)
{
Time *tm= new(ltime) Time(thd, args[0], Time::Options_for_cast(),
Time *tm= new(to) Time(thd, args[0], Time::Options_for_cast(mode),
MY_MIN(decimals, TIME_SECOND_PART_DIGITS));
return (null_value= !tm->is_valid_time());
}

4
sql/sql_type.h
View File

@ -790,6 +790,10 @@ public:
Options_for_cast()
:Options(flags_for_get_date(), DATETIME_TO_TIME_YYYYMMDD_TRUNCATE)
{ }
Options_for_cast(date_mode_t mode)
:Options(flags_for_get_date() | (mode & TIME_FUZZY_DATES),
DATETIME_TO_TIME_YYYYMMDD_TRUNCATE)
{ }
};
private:
bool is_valid_value_slow() const