summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorvva@eagle.mysql.r18.ru <>2003-04-22 18:41:47 -0400
committervva@eagle.mysql.r18.ru <>2003-04-22 18:41:47 -0400
commit11666b528126986e7f4b590aa58626bef761e54a (patch)
tree82a6ee88ce718a01374afecdb2710ee9c420cd6e /sql/item_func.cc
parenta3d08eaaf97c013569516294ae97b8118b3db0b0 (diff)
downloadmariadb-git-11666b528126986e7f4b590aa58626bef761e54a.tar.gz
small compress/uncompress modification after monty's review
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 7a01ea898bb..d427e3c5a3a 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -993,7 +993,8 @@ longlong Item_func_uncompressed_length::val_int()
return 0; /* purecov: inspected */
}
null_value=0;
- return uint4korr(res->c_ptr());
+ if (res->is_empty()) return 0;
+ return uint4korr(res->c_ptr()) & 0x3FFFFFFF;
}
#endif /* HAVE_COMPRESS */