diff options
| author | unknown <ramil@mysql.com> | 2006-05-10 13:27:48 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-05-10 13:27:48 +0500 |
| commit | c6e97f4395e7d41582ed90dd75182f23c8b43d16 (patch) | |
| tree | f9f842e16bc9721d923e63bae370add29afebc57 /sql/item_timefunc.cc | |
| parent | 8ea3f177c201b95087d4aa28a5dac172d462620d (diff) | |
| parent | 1a7ac8bc408c5e1d7c1db478a0f5d9c0f65123b8 (diff) | |
| download | mariadb-git-c6e97f4395e7d41582ed90dd75182f23c8b43d16.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b18501
sql/item_timefunc.cc:
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 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; |