Merge 5.3->5.5

This commit is contained in:
Alexander Barkov 2014-06-04 21:53:15 +04:00
commit 284479c085
24 changed files with 220 additions and 75 deletions

View file

@ -48,7 +48,7 @@ bool double_to_datetime_with_warn(double value, MYSQL_TIME *ltime,
bool decimal_to_datetime_with_warn(const my_decimal *value, MYSQL_TIME *ltime,
ulonglong fuzzydate,
const char *name);
bool int_to_datetime_with_warn(longlong value, MYSQL_TIME *ltime,
bool int_to_datetime_with_warn(bool neg, ulonglong value, MYSQL_TIME *ltime,
ulonglong fuzzydate,
const char *name);