1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Sergei Golubchik 2013-04-09 23:27:14 +02:00
parent 3ad01d00f2
commit eda4c51241
3 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sql/create_options.cc
View File

@ -74,7 +74,7 @@ void engine_option_value::link(engine_option_value **start,
} }
static bool report_wrong_value(THD *thd, const char *name, const char *val, static bool report_wrong_value(THD *thd, const char *name, const char *val,
my_bool suppress_warning) bool suppress_warning)
{ {
if (suppress_warning) if (suppress_warning)
return 0; return 0;
@ -92,7 +92,7 @@ static bool report_wrong_value(THD *thd, const char *name, const char *val,
} }
static bool report_unknown_option(THD *thd, engine_option_value *val, static bool report_unknown_option(THD *thd, engine_option_value *val,
my_bool suppress_warning) bool suppress_warning)
{ {
DBUG_ENTER("report_unknown_option"); DBUG_ENTER("report_unknown_option");
@ -116,7 +116,7 @@ static bool report_unknown_option(THD *thd, engine_option_value *val,
static bool set_one_value(ha_create_table_option *opt, static bool set_one_value(ha_create_table_option *opt,
THD *thd, LEX_STRING *value, void *base, THD *thd, LEX_STRING *value, void *base,
my_bool suppress_warning, bool suppress_warning,
MEM_ROOT *root) MEM_ROOT *root)
{ {
DBUG_ENTER("set_one_value"); DBUG_ENTER("set_one_value");
@ -257,11 +257,10 @@ static const size_t ha_option_type_sizeof[]=
@retval FALSE OK @retval FALSE OK
*/ */
my_bool parse_option_list(THD* thd, void *option_struct_arg, bool parse_option_list(THD* thd, void *option_struct_arg,
engine_option_value *option_list, engine_option_value *option_list,
ha_create_table_option *rules, ha_create_table_option *rules,
my_bool suppress_warning, bool suppress_warning, MEM_ROOT *root)
MEM_ROOT *root)
{ {
ha_create_table_option *opt; ha_create_table_option *opt;
size_t option_struct_size= 0; size_t option_struct_size= 0;
@ -269,13 +268,13 @@ my_bool parse_option_list(THD* thd, void *option_struct_arg,
void **option_struct= (void**)option_struct_arg; void **option_struct= (void**)option_struct_arg;
DBUG_ENTER("parse_option_list"); DBUG_ENTER("parse_option_list");
DBUG_PRINT("enter", DBUG_PRINT("enter",
("struct: 0x%lx list: 0x%lx rules: 0x%lx suppres %u root 0x%lx", ("struct: %p list: %p rules: %p suppress_warning: %u root: %p",
(ulong) *option_struct, (ulong)option_list, (ulong)rules, *option_struct, option_list, rules,
(uint) suppress_warning, (ulong) root)); (uint) suppress_warning, root));
if (rules) if (rules)
{ {
LEX_STRING default_val= {NULL, 0}; LEX_STRING default_val= null_lex_str;
for (opt= rules; opt->name; opt++) for (opt= rules; opt->name; opt++)
set_if_bigger(option_struct_size, opt->offset + set_if_bigger(option_struct_size, opt->offset +
ha_option_type_sizeof[opt->type]); ha_option_type_sizeof[opt->type]);
@ -323,8 +322,7 @@ my_bool parse_option_list(THD* thd, void *option_struct_arg,
@retval FALSE OK @retval FALSE OK
*/ */
my_bool parse_engine_table_options(THD *thd, handlerton *ht, bool parse_engine_table_options(THD *thd, handlerton *ht, TABLE_SHARE *share)
TABLE_SHARE *share)
{ {
MEM_ROOT *root= &share->mem_root; MEM_ROOT *root= &share->mem_root;
DBUG_ENTER("parse_engine_table_options"); DBUG_ENTER("parse_engine_table_options");
@ -543,8 +541,8 @@ uchar *engine_option_value::frm_read(const uchar *buff, engine_option_value **st
@retval FALSE OK @retval FALSE OK
*/ */
my_bool engine_table_options_frm_read(const uchar *buff, uint length, bool engine_table_options_frm_read(const uchar *buff, uint length,
TABLE_SHARE *share) TABLE_SHARE *share)
{ {
const uchar *buff_end= buff + length; const uchar *buff_end= buff + length;
engine_option_value *UNINIT_VAR(end); engine_option_value *UNINIT_VAR(end);

15
sql/create_options.h
View File

@ -69,16 +69,13 @@ class engine_option_value: public Sql_alloc
typedef struct st_key KEY; typedef struct st_key KEY;
class Create_field; 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); 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 *merge_engine_table_options(engine_option_value *source,
engine_option_value *changes, engine_option_value *changes,
MEM_ROOT *root); MEM_ROOT *root);

11
sql/sql_plugin.cc
View File

@ -3387,17 +3387,6 @@ static void plugin_opt_set_limits(struct my_option *options,
options->arg_type= OPT_ARG; options->arg_type= OPT_ARG;
} }
extern "C" my_bool get_one_plugin_option(int optid, const struct my_option *,
char *);
my_bool get_one_plugin_option(int optid __attribute__((unused)),
const struct my_option *opt,
char *argument)
{
return 0;
}
/** /**
Creates a set of my_option objects associated with a specified plugin- Creates a set of my_option objects associated with a specified plugin-
handle. handle.