summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-11-08 01:51:10 +0200
committerunknown <monty@mysql.com>2004-11-08 01:51:10 +0200
commita23fdf7f741df08e59d9216d24653d7baf299221 (patch)
treebbeecf2d734a9725a157b561d18bcc34ab93cf96 /sql/item.cc
parent70d66da883b1d4bc5a9c22737461aba40023d8ff (diff)
downloadmariadb-git-a23fdf7f741df08e59d9216d24653d7baf299221.tar.gz
After merge fixes
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 1f90b1842ac..14ba097cf6d 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1733,6 +1733,13 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
return 0;
}
+Item *Item_field::safe_charset_converter(CHARSET_INFO *tocs)
+{
+ no_const_subst= 1;
+ return Item::safe_charset_converter(tocs);
+}
+
+
void Item_field::cleanup()
{
DBUG_ENTER("Item_field::cleanup");