diff options
| author | unknown <aelkin@mysql.com> | 2006-04-23 12:32:39 +0300 |
|---|---|---|
| committer | unknown <aelkin@mysql.com> | 2006-04-23 12:32:39 +0300 |
| commit | e0ebbf67a308ca58c99b519861a8d884736cd751 (patch) | |
| tree | d9ace40adfab722a50d0f1aeaf05485ca3f80c0b /sql/item_strfunc.cc | |
| parent | 8e28ab1f40e60cbd9837468fc0d357335209f877 (diff) | |
| parent | 8ed06b840e2aaac5d01ca2731f9abd53c339d968 (diff) | |
| download | mariadb-git-e0ebbf67a308ca58c99b519861a8d884736cd751.tar.gz | |
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
mysql-test/t/func_compress.test:
Auto merged
sql/item_strfunc.cc:
Auto 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 60183ac9b5a..a1743aa1181 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2941,6 +2941,7 @@ String *Item_func_uncompress::val_str(String *str) if (!res) goto err; + null_value= 0; if (res->is_empty()) return res; |