diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-21 06:26:02 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-21 06:26:02 -0700 |
| commit | 7a93050bfc23a46843673bf6bd8774486490495d (patch) | |
| tree | 3a37ba1e3973c3635d6222087189524cc24f826d /sql/item_buff.cc | |
| parent | 0310fdf7617665267e85381175044ad0ea8f8fe2 (diff) | |
| parent | 7506094b6aeee00b7ffe8f76a8e5e62bc51006b8 (diff) | |
| download | mariadb-git-7a93050bfc23a46843673bf6bd8774486490495d.tar.gz | |
Manual merge
sql/item_buff.cc:
Auto merged
Diffstat (limited to 'sql/item_buff.cc')
| -rw-r--r-- | sql/item_buff.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_buff.cc b/sql/item_buff.cc index 7e7bbe51657..6652aaafb57 100644 --- a/sql/item_buff.cc +++ b/sql/item_buff.cc @@ -60,8 +60,8 @@ bool Cached_item_str::cmp(void) String *res; bool tmp; - res=item->val_str(&tmp_value); - res->length(min(res->length(), value.alloced_length())); + if ((res=item->val_str(&tmp_value))) + res->length(min(res->length(), value.alloced_length())); if (null_value != item->null_value) { if ((null_value= item->null_value)) |