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

Merge 5.3 -> 5.5

Browse Source
This commit is contained in:
Alexander Barkov
2014-01-27 15:05:23 +04:00
parent ba3d0b173a 7ea9d1e692
commit 0ad8eaeb56
8 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_time.cc
View File

@ -230,6 +230,20 @@ check_date_with_warn(const MYSQL_TIME *ltime, ulonglong fuzzy_date,
}
bool
adjust_time_range_with_warn(MYSQL_TIME *ltime, uint dec)
{
MYSQL_TIME copy= *ltime;
ErrConvTime str(&copy);
int warnings= 0;
if (check_time_range(ltime, dec, &warnings))
return true;
if (warnings)
make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
&str, MYSQL_TIMESTAMP_TIME, NullS);
return false;
}
/*
Convert a string to 8-bit representation,
for use in str_to_time/str_to_date/str_to_date.