summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-01-05 16:03:58 +0200
committerMichael Widenius <monty@askmonty.org>2011-01-05 16:03:58 +0200
commit215043b7c2ace7ce05dcf6c685c87a293ccf1cd7 (patch)
tree679d57ddbf9713b7129872db144ff408b0215b31 /sql/item_func.h
parent31a78529bc5c4431865eba06762e6cc66359f759 (diff)
parent6b03fbf9fcacc74cb2999ba7715d22d754f356c7 (diff)
downloadmariadb-git-215043b7c2ace7ce05dcf6c685c87a293ccf1cd7.tar.gz
Merge with 5.1
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 792f31d4f39..99660bd2a40 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -117,6 +117,7 @@ public:
// Constructor used for Item_cond_and/or (see Item comment)
Item_func(THD *thd, Item_func *item);
bool fix_fields(THD *, Item **ref);
+ void quick_fix_field();
table_map used_tables() const;
table_map not_null_tables() const;
void update_used_tables();