diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-04-07 12:24:10 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-04-07 12:24:10 +0300 |
| commit | 2db44e8bb438cc14161aeec24417ee8c04bd98e6 (patch) | |
| tree | d3c262164be57c2fe1fb85782cac6633259bf3f3 /sql/item_timefunc.h | |
| parent | a4d073ccc0bf154912ca4b22ee062d920bcd34c9 (diff) | |
| parent | 5321b3a57a5191471cba0db85a11e21fb702200a (diff) | |
| download | mariadb-git-2db44e8bb438cc14161aeec24417ee8c04bd98e6.tar.gz | |
merged mysql-5.1->mysql-5.1-security
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 9c1ac512bcb..396b5bbb200 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -106,8 +106,11 @@ public: { DBUG_ASSERT(fixed == 1); return (double) Item_func_month::val_int(); } String *val_str(String *str) { - str->set(val_int(), &my_charset_bin); - return null_value ? 0 : str; + longlong nr= val_int(); + if (null_value) + return 0; + str->set(nr, &my_charset_bin); + return str; } const char *func_name() const { return "month"; } enum Item_result result_type () const { return INT_RESULT; } |