diff options
| author | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
| commit | 62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a (patch) | |
| tree | 4e2cfa6a6a8032773454e22aa802b2798b2935b8 /sql/item_cmpfunc.cc | |
| parent | 96458f8f64641d5b974a17733af8c709b513bfe0 (diff) | |
| parent | 0944bed7fcb59fb38230a750bd820a22b3b6b476 (diff) | |
| download | mariadb-git-62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a.tar.gz | |
Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index bb1ea09d6bc..5b6484f5017 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1162,6 +1162,15 @@ Item_func_nullif::val_str(String *str) return res; } + +bool +Item_func_nullif::is_null() +{ + if (!(this->*cmp_func)()) + return null_value=1; + return 0; +} + /* CASE expression Return the matching ITEM or NULL if all compares (including else) failed |