diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
| commit | 11fe627e3f0ecf45abdb49f3b92cca88b12465e7 (patch) | |
| tree | bb1fdd7363fbf2580572ac9a56dbd4c933cc4c0d /sql/item_strfunc.cc | |
| parent | c805d9bc0b127e1126eeb7814d5ff5d66a539b47 (diff) | |
| parent | ba192d38bda55ac8b2cf3ccc5a6338e053ccddb1 (diff) | |
| download | mariadb-git-11fe627e3f0ecf45abdb49f3b92cca88b12465e7.tar.gz | |
Merge MySQL 5.1.46 into MariaDB.mariadb-merge-mysql-5.1.46
Still two test failures to be solved: main.myisam and main.subselect.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index b4dd2905fa4..810c4993379 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -324,7 +324,7 @@ String *Item_func_concat::val_str(String *str) } else if (str->alloced_length() >= res->length()+res2->length()) { - if (str == res2) + if (str->ptr() == res2->ptr()) str->replace(0,0,*res); else { |