summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <tsmith@build.mysql.com>2004-05-10 23:19:50 +0200
committerunknown <tsmith@build.mysql.com>2004-05-10 23:19:50 +0200
commitd5c2e2b2d34e90250b3f24071ab718684e58f0b1 (patch)
tree43698cf3eec4c3bd7af301601c52f74c06c449f4 /sql/item_cmpfunc.cc
parent572899e0362f08755a82603a36a27628fb88a5d0 (diff)
downloadmariadb-git-d5c2e2b2d34e90250b3f24071ab718684e58f0b1.tar.gz
logging_ok:
Logging to logging@openlogging.org accepted item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704) mysql-test/r/ctype_recoding.result: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() mysql-test/t/ctype_recoding.test: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() sql/item_cmpfunc.cc: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc1
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];
}