summaryrefslogtreecommitdiff
path: root/sql/create_options.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 23:27:14 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 23:27:14 +0200
commiteda4c51241b647094b727643e1aad4153c45d647 (patch)
tree3dcc9606a1a81e5133c7facc9c5e82839050a32b /sql/create_options.h
parent3ad01d00f2eaef56ed06041f7ac26328e998155b (diff)
downloadmariadb-git-eda4c51241b647094b727643e1aad4153c45d647.tar.gz
cleanup
Diffstat (limited to 'sql/create_options.h')
-rw-r--r--sql/create_options.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/sql/create_options.h b/sql/create_options.h
index ae918f6cea1..5db826a3038 100644
--- a/sql/create_options.h
+++ b/sql/create_options.h
@@ -69,16 +69,13 @@ class engine_option_value: public Sql_alloc
typedef struct st_key KEY;
class Create_field;
-my_bool parse_engine_table_options(THD *thd, handlerton *ht,
+bool parse_engine_table_options(THD *thd, handlerton *ht, TABLE_SHARE *share);
+bool parse_option_list(THD* thd, void *option_struct,
+ engine_option_value *option_list,
+ ha_create_table_option *rules,
+ bool suppress_warning, MEM_ROOT *root);
+bool engine_table_options_frm_read(const uchar *buff, uint length,
TABLE_SHARE *share);
-my_bool parse_option_list(THD* thd, void *option_struct,
- engine_option_value *option_list,
- ha_create_table_option *rules,
- my_bool suppress_warning,
- MEM_ROOT *root);
-my_bool engine_table_options_frm_read(const uchar *buff,
- uint length,
- TABLE_SHARE *share);
engine_option_value *merge_engine_table_options(engine_option_value *source,
engine_option_value *changes,
MEM_ROOT *root);