diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-03-17 16:29:24 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-17 16:29:24 -0400 |
| commit | 0d588edf61c93ab67fb7e26101a0fc00d021bb11 (patch) | |
| tree | 3c313f70fd16653491985d8e8108fb5b99f0d5d0 /sql/item.h | |
| parent | 5b7347bda31b9d66cd78937e5dc339f553b9a736 (diff) | |
| parent | 7ca1ebd83a1a7d291593be7a94f5a37298dfc863 (diff) | |
| download | mariadb-git-0d588edf61c93ab67fb7e26101a0fc00d021bb11.tar.gz | |
auto-merge
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index d28ee1a29fb..96a4e9f7a31 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); |