diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-02-13 19:37:05 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-02-13 19:37:05 +0400 |
| commit | 22e2762640a401a71604c2fdb1a3a3454b79de80 (patch) | |
| tree | d93b2a137a6235824590b1871d219fee4827c6f6 /sql/item_cmpfunc.cc | |
| parent | 7a43d720245d1d9999ebf7d064063ed873eea60d (diff) | |
| parent | 7a290b55f7691b2518cb1d83da252e07376954f6 (diff) | |
| download | mariadb-git-22e2762640a401a71604c2fdb1a3a3454b79de80.tar.gz | |
Merge host.loc:/home/uchum/work/5.0-opt-gca
into host.loc:/home/uchum/work/5.1-opt-gca
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 1d1e28593d4..01eca1b20a8 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -3053,7 +3053,10 @@ void in_string::set(uint pos,Item *item) { if (res->uses_buffer_owned_by(str)) res->copy(); - *str= *res; + if (item->type() == Item::FUNC_ITEM) + str->copy(*res); + else + *str= *res; } if (!str->charset()) { |