diff options
| author | monty@mysql.com <> | 2004-03-17 10:36:12 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-17 10:36:12 +0200 |
| commit | f9ad65049088dc58591c954903a22e527e96ea5a (patch) | |
| tree | 6f4235e7fd4eb101374c74e2c3c02470bb69d2ab /sql | |
| parent | 44667503b75b539e43a057743f7baefce418d4d6 (diff) | |
| parent | e8c65b886d91eded17d3aa859da831fd04877549 (diff) | |
| download | mariadb-git-f9ad65049088dc58591c954903a22e527e96ea5a.tar.gz | |
merge with 4.0
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 f0bc73e9501..122cc93bc3c 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -977,7 +977,7 @@ double Item_func_nullif::val() { double value; - if (!cmp.compare() || null_value) + if (!cmp.compare()) { null_value=1; return 0.0; @@ -991,7 +991,7 @@ longlong Item_func_nullif::val_int() { longlong value; - if (!cmp.compare() || null_value) + if (!cmp.compare()) { null_value=1; return 0; @@ -1005,7 +1005,7 @@ String * Item_func_nullif::val_str(String *str) { String *res; - if (!cmp.compare() || null_value) + if (!cmp.compare()) { null_value=1; return 0; |