diff options
| author | unknown <tsmith@build.mysql.com> | 2004-05-11 14:44:25 +0200 |
|---|---|---|
| committer | unknown <tsmith@build.mysql.com> | 2004-05-11 14:44:25 +0200 |
| commit | 7b4cbde8edeb461ddacdc4d06d33fb8705380f40 (patch) | |
| tree | d8be36cfc6d6ec5a6c535421185ce63634f267fe /sql | |
| parent | 5e96b1c52a92bffb0b5d00a4b0c2e08093d580e3 (diff) | |
| parent | d5c2e2b2d34e90250b3f24071ab718684e58f0b1 (diff) | |
| download | mariadb-git-7b4cbde8edeb461ddacdc4d06d33fb8705380f40.tar.gz | |
Merge build:/home/bk/mysql-4.1
into build.mysql.com:/users/tsmith/m/41/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index afbf0b7163e..446d72ac143 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -221,6 +221,7 @@ void Item_bool_func2::fix_length_and_dec() { conv= new Item_func_conv_charset(args[weak],args[strong]->collation.collation); conv->collation.set(args[weak]->collation.derivation); + conv->fix_fields(current_thd, 0, &conv); } args[weak]= conv ? conv : args[weak]; } |