diff options
| author | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 15:42:36 +0300 |
|---|---|---|
| committer | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 18:39:21 +0300 |
| commit | 0f83c8878dc1389212c134f65d37a43d9d248250 (patch) | |
| tree | 6950ea9b6c449a6e5d8a0205b3d06ae275a6234c /sql/item_sum.cc | |
| parent | aa96e56c55c44d2c20c1cd70325ef88ad0af8f98 (diff) | |
| parent | d2f094d9e63e97293915b17b30a73b2552647a38 (diff) | |
| download | mariadb-git-0f83c8878dc1389212c134f65d37a43d9d248250.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index cb7b9264b3b..111dc88a1e3 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3089,11 +3089,14 @@ Item_sum_hybrid::min_max_update_str_field() if (!args[0]->null_value) { - result_field->val_str(&cmp->value2); - - if (result_field->is_null() || - (cmp_sign * sortcmp(res_str,&cmp->value2,collation.collation)) < 0) + if (result_field->is_null()) result_field->store(res_str->ptr(),res_str->length(),res_str->charset()); + else + { + result_field->val_str(&cmp->value2); + if ((cmp_sign * sortcmp(res_str,&cmp->value2,collation.collation)) < 0) + result_field->store(res_str->ptr(),res_str->length(),res_str->charset()); + } result_field->set_notnull(); } DBUG_VOID_RETURN; |