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 from 5.3

Browse Source 
modified:
  mysql-test/r/type_date.result
  mysql-test/r/type_datetime.result
  mysql-test/r/type_time.result
  mysql-test/t/type_date.test
  mysql-test/t/type_datetime.test
  mysql-test/t/type_time.test
  sql/item_func.cc
  sql/item_timefunc.cc
  sql/sql_time.cc
  sql/sql_time.h
pending merges:
  Alexander Barkov 2013-06-28 MDEV-4634 Crash in CONVERT_TZ
This commit is contained in:
Alexander Barkov
2013-06-28 15:20:40 +04:00
parent d058863d8e 0e44faf27f
commit f13236be86
10 changed files with 80 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_time.cc
View File

@ -214,6 +214,22 @@ ulong convert_month_to_period(ulong month)
}
bool
check_date_with_warn(const MYSQL_TIME *ltime, ulonglong fuzzy_date,
timestamp_type ts_type)
{
int dummy_warnings;
if (check_date(ltime, fuzzy_date, &dummy_warnings))
{
ErrConvTime str(ltime);
make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
&str, ts_type, 0);
return true;
}
return false;
}
/*
Convert a string to 8-bit representation,
for use in str_to_time/str_to_date/str_to_date.