diff options
| author | gluh@gluh.mysql.r18.ru <> | 2004-03-16 11:33:03 +0400 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2004-03-16 11:33:03 +0400 |
| commit | 86211a1b446fe0d164f19d25f966d5fbfc9963fb (patch) | |
| tree | b96052040aa2326af60424f3196dba87bd2b986f /sql/item_cmpfunc.cc | |
| parent | 2bf78563f7a87cbeac8201f06983e5caab5b0cc6 (diff) | |
| download | mariadb-git-86211a1b446fe0d164f19d25f966d5fbfc9963fb.tar.gz | |
Fix for bug #2629 NULLIF() doesn't behave as described in manual
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 82f368970e2..d84dab3425a 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -616,7 +616,7 @@ double Item_func_nullif::val() { double value; - if (!(this->*cmp_func)() || null_value) + if (!(this->*cmp_func)()) { null_value=1; return 0.0; @@ -630,7 +630,7 @@ longlong Item_func_nullif::val_int() { longlong value; - if (!(this->*cmp_func)() || null_value) + if (!(this->*cmp_func)()) { null_value=1; return 0; @@ -644,7 +644,7 @@ String * Item_func_nullif::val_str(String *str) { String *res; - if (!(this->*cmp_func)() || null_value) + if (!(this->*cmp_func)()) { null_value=1; return 0; |