summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-02-19 17:59:00 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-02-19 17:59:00 +0400
commitfafeaf460bdb72e8f9976aada6c1c8bcce48f993 (patch)
tree5b584f2a2468cfc4803488226ffce1ee093eb3d5 /sql/item.h
parentb2a8faebea8b83c2d90096dac2627290f090bb07 (diff)
parentc2e23208ef7ae6b315ca4988e903bff2bc0284d4 (diff)
downloadmariadb-git-fafeaf460bdb72e8f9976aada6c1c8bcce48f993.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index be9daf672f0..33c0d1027fa 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1303,6 +1303,8 @@ bool agg_item_collations(DTCollation &c, const char *name,
Item **items, uint nitems, uint flags, int item_sep);
bool agg_item_collations_for_comparison(DTCollation &c, const char *name,
Item **items, uint nitems, uint flags);
+bool agg_item_set_converter(DTCollation &coll, const char *fname,
+ Item **args, uint nargs, uint flags, int item_sep);
bool agg_item_charsets(DTCollation &c, const char *name,
Item **items, uint nitems, uint flags, int item_sep);