diff options
author | unknown <igor@rurik.mysql.com> | 2006-04-21 08:22:03 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2006-04-21 08:22:03 -0700 |
commit | bb40065a1f418614ad530817ffc4f55be242c1f9 (patch) | |
tree | e535e304f3fbcf5ac1a4f7e6eaca9c219e89807f /sql | |
parent | d4f4f5bdaf43b07036d89973ce247fe43009958f (diff) | |
parent | 04be401f96d4bdf716f3ef21c98a8c4dd157b83f (diff) | |
download | mariadb-git-bb40065a1f418614ad530817ffc4f55be242c1f9.tar.gz |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
Diffstat (limited to 'sql')
-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 04765e18191..f0127ed2a5d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2850,6 +2850,7 @@ String *Item_func_uncompress::val_str(String *str) if (!res) goto err; + null_value= 0; if (res->is_empty()) return res; |