diff options
| author | gluh@gluh.mysql.r18.ru <> | 2004-03-16 11:33:36 +0400 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2004-03-16 11:33:36 +0400 |
| commit | f6816f32bd52948d234f1d644b8e78503878a060 (patch) | |
| tree | 062b3297b58f018ea7c799a894c96ce1a72635a1 /sql | |
| parent | 325f6615254c871d71d9d71bb5910a61d9a61ea2 (diff) | |
| parent | 86211a1b446fe0d164f19d25f966d5fbfc9963fb (diff) | |
| download | mariadb-git-f6816f32bd52948d234f1d644b8e78503878a060.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
Diffstat (limited to 'sql')
| -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; |