diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-21 10:56:40 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-21 10:56:40 +0200 |
| commit | 62c7449a5594972f5e940bfdf8785a70f82af82c (patch) | |
| tree | ad383628b0de0a338b83b72a5c8832d3177b18af /sql/item_cmpfunc.cc | |
| parent | 23362b5cae7acbe00b64980802e8e5e7f9480f7d (diff) | |
| parent | 5f1b9717c53f19ef4f7a5206f59a7678a025dbe2 (diff) | |
| download | mariadb-git-62c7449a5594972f5e940bfdf8785a70f82af82c.tar.gz | |
Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE
innobase/btr/btr0sea.c:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/case.result:
merge with 3.23
sql/sql_db.cc:
Merge with 3.23 (to remove duplicate casedn_str())
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 0e7d38ecda8..a36c96ffea4 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -727,8 +727,9 @@ String *Item_func_case::val_str(String *str) null_value=1; return 0; } + null_value= 0; if (!(res=item->val_str(str))) - null_value=1; + null_value= 1; return res; } |