summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorramil/ram@mysql.com/myoffice.izhnet.ru <>2006-10-13 19:09:22 +0500
committerramil/ram@mysql.com/myoffice.izhnet.ru <>2006-10-13 19:09:22 +0500
commit84048dc763f1508d34d84938b4fd5477ddb01b12 (patch)
treedfd90ca34ee2693bbfa69db04a88e72bebbfb5ca /sql/item_strfunc.cc
parentfe7fce366478576883e3bf8d0b6c385ea15d6e30 (diff)
parent31402835d4cef73dbe720f68dd79af0d6b68d1e8 (diff)
downloadmariadb-git-84048dc763f1508d34d84938b4fd5477ddb01b12.tar.gz
Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
into mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 31c2f44fc3e..4f3e280fc8a 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2965,6 +2965,7 @@ String *Item_func_compress::val_str(String *str)
null_value= 1;
return 0;
}
+ null_value= 0;
if (res->is_empty()) return res;
/*