summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-02-10 17:59:16 +0200
committermonty@mashka.mysql.fi <>2003-02-10 17:59:16 +0200
commit48558055edeb386ff6fb52c79763023b686fc86a (patch)
treeafc92b80727719cbb09f63c506e547cb0aed94f4 /sql/item_func.cc
parentaee7346ec11b6ec83747de21490d6f7ecf1ca6be (diff)
downloadmariadb-git-48558055edeb386ff6fb52c79763023b686fc86a.tar.gz
Move tmp_table_used to THD
Optimize depending sub querys Remove valgrind warnings
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 6494573458c..788961a954d 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -120,10 +120,10 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
used_tables_cache|=(*arg)->used_tables();
const_item_cache&= (*arg)->const_item();
}
- if (result_type() == STRING_RESULT)
- set_charset((*args)->charset());
}
fix_length_and_dec();
+ if (result_type() == STRING_RESULT)
+ set_charset((*args)->charset());
fixed= 1;
return 0;
}