diff options
| author | unknown <tnurnberg@mysql.com> | 2006-05-11 12:48:49 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com> | 2006-05-11 12:48:49 +0200 |
| commit | ec83dd7c61f4e29122ecff278ca81b03bd51b271 (patch) | |
| tree | 5985f0f4e626b36c146553994284dd46d57cd8b7 /sql | |
| parent | dd934da9159a6eb69fdd7fdd91a78c801a0b7caa (diff) | |
| parent | bc1815aa3d8a700f28a139a63fdbee684e482f0d (diff) | |
| download | mariadb-git-ec83dd7c61f4e29122ecff278ca81b03bd51b271.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql-4.1-10418
Diffstat (limited to 'sql')
| -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 670fb94fc2c..5fdbd968df1 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -906,9 +906,9 @@ String* Item_func_monthname::val_str(String* str) { DBUG_ASSERT(fixed == 1); const char *month_name; - uint month=(uint) Item_func_month::val_int(); + uint month= (uint) val_int(); - if (!month) // This is also true for NULL + if (null_value || !month) { null_value=1; return (String*) 0; |