diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
| commit | b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083 (patch) | |
| tree | 6068b9d90b4127b1c3608e29913fa82bf1a1f20e /sql/item_timefunc.cc | |
| parent | 7840965db9460e2117c163f3db83aaa247c65203 (diff) | |
| parent | 498ee6bd19eabc85dcbd9abebc9cf6aeb79d1985 (diff) | |
| download | mariadb-git-b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083.tar.gz | |
Merge with MySQL 5.1.52
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 57656f30294..443bf3faf6f 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2277,8 +2277,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; @@ -2321,6 +2319,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->ptr(), res->length(), <ime)) { |