diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-22 16:18:54 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-22 16:18:54 -0700 |
| commit | 596102c9be5ef44e508c004be196cf469b8f3fcf (patch) | |
| tree | 45607317dc3f4ec13ac11f9c48a1f253c2cce9db /sql/item_sum.cc | |
| parent | 2cec841b4c28c645599e48e9e8e9fad58c03173b (diff) | |
| parent | e8adb499107c182ad5737cda5b726f8d8e924ecf (diff) | |
| download | mariadb-git-596102c9be5ef44e508c004be196cf469b8f3fcf.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
sql/item_sum.cc:
Auto merged
mysql-test/r/ctype_ucs.result:
Manual merge
mysql-test/t/ctype_ucs.test:
Manual merge
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 962454e237e..877eb908d27 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2102,7 +2102,6 @@ Item_sum_hybrid::min_max_update_str_field() if (!args[0]->null_value) { - res_str->strip_sp(); result_field->val_str(&tmp_value); if (result_field->is_null() || |