diff options
| author | kaa@kaamos.(none) <> | 2008-03-12 11:19:46 +0300 |
|---|---|---|
| committer | kaa@kaamos.(none) <> | 2008-03-12 11:19:46 +0300 |
| commit | 0a7052e4d3633b818ab4050adcad646b888c5430 (patch) | |
| tree | f84e4ada799bf37a3d9ef074064f8a17f408aa89 /sql/item_cmpfunc.cc | |
| parent | d4025ce1a60322635bf5f7adb765f4612563ee3a (diff) | |
| parent | 7e365efa30f5d42aaf87ce9044176e266ee337eb (diff) | |
| download | mariadb-git-0a7052e4d3633b818ab4050adcad646b888c5430.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
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 ae7ea95707c..f267ad39984 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -3059,7 +3059,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()) { |