diff options
| author | Evgeny Potemkin <epotemkin@mysql.com> | 2010-10-07 12:17:08 +0400 |
|---|---|---|
| committer | Evgeny Potemkin <epotemkin@mysql.com> | 2010-10-07 12:17:08 +0400 |
| commit | 5dc76bfabf7ece3040e518d560a08519dd3b7fd7 (patch) | |
| tree | d4f173311650fd60265648e69aaf9aa7ca5362b5 /sql/item_timefunc.cc | |
| parent | 3c9c7efb3b9f505e3db5b2dc2fdef30893f7d5f0 (diff) | |
| parent | 985fa88f8b07743dd3a848c11bc1d93b826d3d62 (diff) | |
| download | mariadb-git-5dc76bfabf7ece3040e518d560a08519dd3b7fd7.tar.gz | |
Auto-merged.
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 e53558a3385..49336b04e16 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -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(), |