diff options
| author | unknown <sergefp@mysql.com> | 2005-02-05 01:52:17 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-02-05 01:52:17 +0300 |
| commit | 65cd36fc88aae96a3474350205bc22d92f4b34a7 (patch) | |
| tree | aad2c1463d49f0a241179d4f7586fcc086b40e45 /sql/item_cmpfunc.cc | |
| parent | 74ad9e8f1efde5295b9bf0b4bc4a3331d0faab4f (diff) | |
| parent | ebda548d0d26f49a05d424f186e0b1d92c90925e (diff) | |
| download | mariadb-git-65cd36fc88aae96a3474350205bc22d92f4b34a7.tar.gz | |
Merge mysql.com:/home/psergey/mysql-4.1-bug7816
into mysql.com:/home/psergey/mysql-5.0-bug7716
sql/item_cmpfunc.cc:
Auto merged
sql/sql_string.h:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 96689bd0ac2..e63bafe4811 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1530,7 +1530,11 @@ void in_string::set(uint pos,Item *item) String *str=((String*) base)+pos; String *res=item->val_str(str); if (res && res != str) + { + if (res->uses_buffer_owned_by(str)) + res->copy(); *str= *res; + } if (!str->charset()) { CHARSET_INFO *cs; |