diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-21 04:24:21 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-21 04:24:21 -0700 |
| commit | 7b1ec027325870da62d0a6b36eeb04b03bd0f576 (patch) | |
| tree | 6a5160e60d71a61a6276fc0e587e3660e267c5bf /sql/item_buff.cc | |
| parent | 15b113e186939e091af4c93759dfc1ca66a37fda (diff) | |
| download | mariadb-git-7b1ec027325870da62d0a6b36eeb04b03bd0f576.tar.gz | |
group_by.result, group_by.test:
Added a test case for bug #11295.
item_buff.cc:
Fixed bug #11295.
This a correction for the patch of bug #11088 that takes into
account a possible NULL values of the BLOB column.
sql/item_buff.cc:
Fixed bug #11295.
This a correction for the patch of bug #11088 that takes into
account a possible NULL values of the BLOB column.
mysql-test/t/group_by.test:
Added a test case for bug #11295.
mysql-test/r/group_by.result:
Added a test case for bug #11295.
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 f5e77862e1d..8298ce2cfb7 100644 --- a/sql/item_buff.cc +++ b/sql/item_buff.cc @@ -51,8 +51,8 @@ bool Item_str_buff::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)) |