diff options
| author | unknown <sanja@askmonty.org> | 2012-12-23 20:57:54 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2012-12-23 20:57:54 +0200 |
| commit | 40ae63dd65fb9e812f29d3520acb0ba6b64d3005 (patch) | |
| tree | a11cd4a7bc7660d1d2159497469f32e4f8d177f4 /sql/item_strfunc.h | |
| parent | 28c9e1a550bc9f2c2dbb28304d22552ea944cf07 (diff) | |
| download | mariadb-git-40ae63dd65fb9e812f29d3520acb0ba6b64d3005.tar.gz | |
backport to 5.5 dyncol changes and names support
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index e6a7e1291b8..8ef67654b35 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1001,10 +1001,10 @@ class Item_func_dyncol_create: public Item_str_func protected: DYNCALL_CREATE_DEF *defs; DYNAMIC_COLUMN_VALUE *vals; - uchar *keys; + uint *keys_num; + LEX_STRING *keys_str; bool names, force_names; bool prepare_arguments(bool force_names); - void cleanup_arguments(); void print_arguments(String *str, enum_query_type query_type); public: Item_func_dyncol_create(List<Item> &args, DYNCALL_CREATE_DEF *dfs); @@ -1013,6 +1013,7 @@ public: const char *func_name() const{ return "column_create"; } String *val_str(String *); virtual void print(String *str, enum_query_type query_type); + virtual enum Functype functype() const { return DYNCOL; } }; @@ -1081,3 +1082,4 @@ public: extern String my_empty_string; #endif /* ITEM_STRFUNC_INCLUDED */ + |