diff options
| author | unknown <bar@mysql.com> | 2005-01-18 10:45:09 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-01-18 10:45:09 +0400 |
| commit | fd48151791a0b671731fe1cc06e11dc6a08cb415 (patch) | |
| tree | 0c49c4b613e3a770e1ef912e8804722020503930 /sql/item_strfunc.cc | |
| parent | a8afc137920db4e13f0b379204a3e765d9c28dd7 (diff) | |
| parent | ec0daa744fe6b1141e4d8815b574c2a1e38366e8 (diff) | |
| download | mariadb-git-fd48151791a0b671731fe1cc06e11dc6a08cb415.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/ctype_utf8.result:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index b077deb863b..5d018b22055 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -277,7 +277,8 @@ String *Item_func_concat::val_str(String *str) current_thd->variables.max_allowed_packet); goto null; } - if (res->alloced_length() >= res->length()+res2->length()) + if (!args[0]->const_item() && + res->alloced_length() >= res->length()+res2->length()) { // Use old buffer res->append(*res2); } |