diff options
| author | igor@igor-inspiron.creware.com <> | 2005-06-13 11:45:29 -0700 |
|---|---|---|
| committer | igor@igor-inspiron.creware.com <> | 2005-06-13 11:45:29 -0700 |
| commit | 785fca1162ab364d1f0552308d99578768daf2c5 (patch) | |
| tree | 6589c3bbdc00cecba70b67ca4532f99328e8ada1 /sql/item_cmpfunc.cc | |
| parent | df93c2783f56da93d1c1911dac5748e565d47354 (diff) | |
| parent | 754e6c05274f434211f71be6768524e426809d65 (diff) | |
| download | mariadb-git-785fca1162ab364d1f0552308d99578768daf2c5.tar.gz | |
Manual merge
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index b5b37efaf07..e79a356c4d3 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1406,9 +1406,7 @@ Item_func_nullif::val_decimal(my_decimal * decimal_value) bool Item_func_nullif::is_null() { - if (!cmp.compare()) - return (null_value=1); - return 0; + return (null_value= (!cmp.compare() ? 1 : args[0]->null_value)); } /* |