summaryrefslogtreecommitdiff
path: root/sql/create_options.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/create_options.cc')
-rw-r--r--sql/create_options.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc
index e80b213cc81..8e46bb583a5 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.cc
@@ -186,7 +186,8 @@ static bool set_one_value(ha_create_table_option *opt,
*val= num;
DBUG_RETURN(0);
}
- if (*end) *end++;
+ if (*end)
+ end++;
start= end;
num++;
}
@@ -256,7 +257,7 @@ static const size_t ha_option_type_sizeof[]=
@retval FALSE OK
*/
-my_bool parse_option_list(THD* thd, void **option_struct,
+my_bool parse_option_list(THD* thd, void *option_struct_arg,
engine_option_value *option_list,
ha_create_table_option *rules,
my_bool suppress_warning,
@@ -265,6 +266,7 @@ my_bool parse_option_list(THD* thd, void **option_struct,
ha_create_table_option *opt;
size_t option_struct_size= 0;
engine_option_value *val= option_list;
+ void **option_struct= (void**)option_struct_arg;
DBUG_ENTER("parse_option_list");
DBUG_PRINT("enter",
("struct: 0x%lx list: 0x%lx rules: 0x%lx suppres %u root 0x%lx",