diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-13 19:09:22 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-13 19:09:22 +0500 |
| commit | 0ace2b44ba0410e901d18c5315837647c8436c1d (patch) | |
| tree | dfd90ca34ee2693bbfa69db04a88e72bebbfb5ca /sql/item_strfunc.cc | |
| parent | a4f01a94b4d6fdf3d1c79446c7f1a36f50903d1d (diff) | |
| parent | 60a21d16975de436d57c9e29f237234b71fd5601 (diff) | |
| download | mariadb-git-0ace2b44ba0410e901d18c5315837647c8436c1d.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
into mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
sql/item_strfunc.cc:
Auto merged
mysql-test/r/func_compress.result:
SCCS merged
mysql-test/t/func_compress.test:
SCCS merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 1 |
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; /* |