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

@@old_mode=zero_date_time_cast

Browse Source
This commit is contained in:
Sergei Golubchik
2014-03-07 21:05:28 +01:00
parent 68916bcab3
commit 12f54d7de0
8 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_time.cc
View File

@ -1243,7 +1243,7 @@ time_to_datetime_old(THD *thd, const MYSQL_TIME *from, MYSQL_TIME *to)
bool
time_to_datetime(THD *thd, const MYSQL_TIME *from, MYSQL_TIME *to)
{
if (thd->variables.old_mode)
if (thd->variables.old_behavior & OLD_MODE_ZERO_DATE_TIME_CAST)
return time_to_datetime_old(thd, from, to);
set_current_date(thd, to);
mix_date_and_time(to, from);
@ -1266,7 +1266,8 @@ time_to_datetime_with_warn(THD *thd,
only in the old mode.
*/
if (time_to_datetime(thd, from, to) ||
(thd->variables.old_mode && check_date(to, fuzzydate, &warn)))
((thd->variables.old_behavior && OLD_MODE_ZERO_DATE_TIME_CAST) &&
check_date(to, fuzzydate, &warn)))
{
ErrConvTime str(from);
make_truncated_value_warning(thd, Sql_condition::WARN_LEVEL_WARN,
@ -1274,4 +1275,4 @@ time_to_datetime_with_warn(THD *thd,
return true;
}
return false;
}
}