database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

mysql-5.1 -> mysql-5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2010-11-05 10:59:51 +01:00
parent 4cce72a929 4cfa91f42c
commit bc2e383e4a
94 changed files with 2028 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_timefunc.cc
View File

@@ -2338,8 +2338,6 @@ void Item_extract::print(String *str, enum_query_type query_type)
void Item_extract::fix_length_and_dec()
{
value.alloc(32); // alloc buffer
maybe_null=1; // If wrong date
switch (int_type) {
case INTERVAL_YEAR: max_length=4; date_value=1; break;
@@ -2382,6 +2380,8 @@ longlong Item_extract::val_int()
}
else
{
char buf[40];
String value(buf, sizeof(buf), &my_charset_bin);;
String *res= args[0]->val_str(&value);
if (!res ||
str_to_time_with_warn(res->charset(), res->ptr(), res->length(),