Skip to content

Commit 68e369e

Browse files
FooBarriorsanja-byelkin
authored andcommitted
Sys_var_plugin: use const for default plugin name
1 parent 4a819f5 commit 68e369e

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

sql/mysqld.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ static char *lc_messages;
348348
static char *lc_time_names_name;
349349
char *my_bind_addr_str;
350350
static char *default_collation_name;
351-
char *default_storage_engine, *default_tmp_storage_engine;
352-
char *enforced_storage_engine=NULL;
351+
const char *default_storage_engine, *default_tmp_storage_engine;
352+
const char *enforced_storage_engine=NULL;
353353
char *gtid_pos_auto_engines;
354354
plugin_ref *opt_gtid_pos_auto_plugins;
355355
static char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME;
@@ -4854,7 +4854,8 @@ static void add_file_to_crash_report(char *file)
48544854
init_default_storage_engine_impl(#X, X, &global_system_variables.Y)
48554855

48564856
static int init_default_storage_engine_impl(const char *opt_name,
4857-
char *engine_name, plugin_ref *res)
4857+
const char *engine_name,
4858+
plugin_ref *res)
48584859
{
48594860
if (!engine_name)
48604861
{

sql/mysqld.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ extern ulong opt_replicate_events_marked_for_skip;
146146
extern char *default_tz_name;
147147
extern Time_zone *default_tz;
148148
extern char *my_bind_addr_str;
149-
extern char *default_storage_engine, *default_tmp_storage_engine;
150-
extern char *enforced_storage_engine;
149+
extern const char *default_storage_engine, *default_tmp_storage_engine;
150+
extern const char *enforced_storage_engine;
151151
extern char *gtid_pos_auto_engines;
152152
extern plugin_ref *opt_gtid_pos_auto_plugins;
153153
extern bool opt_endinfo, using_udf_functions;

sql/sys_vars.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@ public:
16401640
Sys_var_plugin(const char *name_arg,
16411641
const char *comment, int flag_args, ptrdiff_t off, size_t size,
16421642
CMD_LINE getopt,
1643-
int plugin_type_arg, char **def_val, PolyLock *lock=0,
1643+
int plugin_type_arg, const char **def_val, PolyLock *lock=0,
16441644
enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
16451645
on_check_function on_check_func=0,
16461646
on_update_function on_update_func=0,

0 commit comments

Comments
 (0)