Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1a731af1
Commit
1a731af1
authored
Sep 19, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: remove redundant clauses from sys_vars.cc
parent
b054e4bd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
25 deletions
+13
-25
sql/sys_vars.cc
sql/sys_vars.cc
+11
-23
sql/sys_vars.h
sql/sys_vars.h
+2
-2
No files found.
sql/sys_vars.cc
View file @
1a731af1
...
@@ -1000,8 +1000,7 @@ static Sys_var_session_lexstring Sys_default_master_connection(
...
@@ -1000,8 +1000,7 @@ static Sys_var_session_lexstring Sys_default_master_connection(
"Master connection to use for all slave variables and slave commands"
,
"Master connection to use for all slave variables and slave commands"
,
SESSION_ONLY
(
default_master_connection
),
SESSION_ONLY
(
default_master_connection
),
NO_CMD_LINE
,
IN_SYSTEM_CHARSET
,
NO_CMD_LINE
,
IN_SYSTEM_CHARSET
,
DEFAULT
(
""
),
MAX_CONNECTION_NAME
,
ON_CHECK
(
check_master_connection
),
DEFAULT
(
""
),
MAX_CONNECTION_NAME
,
ON_CHECK
(
check_master_connection
));
ON_UPDATE
(
0
));
#endif
#endif
static
Sys_var_charptr
Sys_init_file
(
static
Sys_var_charptr
Sys_init_file
(
...
@@ -2790,8 +2789,7 @@ static Sys_var_replicate_events_marked_for_skip Replicate_events_marked_for_skip
...
@@ -2790,8 +2789,7 @@ static Sys_var_replicate_events_marked_for_skip Replicate_events_marked_for_skip
"@@skip_replication=1 will be filtered on the master and never be sent to "
"@@skip_replication=1 will be filtered on the master and never be sent to "
"the slave)."
,
"the slave)."
,
GLOBAL_VAR
(
opt_replicate_events_marked_for_skip
),
CMD_LINE
(
REQUIRED_ARG
),
GLOBAL_VAR
(
opt_replicate_events_marked_for_skip
),
CMD_LINE
(
REQUIRED_ARG
),
replicate_events_marked_for_skip_names
,
DEFAULT
(
RPL_SKIP_REPLICATE
),
replicate_events_marked_for_skip_names
,
DEFAULT
(
RPL_SKIP_REPLICATE
));
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
);
#endif
#endif
...
@@ -2936,7 +2934,7 @@ static Sys_var_set Sys_old_behavior(
...
@@ -2936,7 +2934,7 @@ static Sys_var_set Sys_old_behavior(
"old_mode"
,
"old_mode"
,
"Used to emulate old behavior from earlier MariaDB or MySQL versions"
,
"Used to emulate old behavior from earlier MariaDB or MySQL versions"
,
SESSION_VAR
(
old_behavior
),
CMD_LINE
(
REQUIRED_ARG
),
SESSION_VAR
(
old_behavior
),
CMD_LINE
(
REQUIRED_ARG
),
old_mode_names
,
DEFAULT
(
0
)
,
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
);
old_mode_names
,
DEFAULT
(
0
));
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
#define SSL_OPT(X) CMD_LINE(REQUIRED_ARG,X)
#define SSL_OPT(X) CMD_LINE(REQUIRED_ARG,X)
...
@@ -3270,8 +3268,7 @@ static Sys_var_plugin Sys_storage_engine(
...
@@ -3270,8 +3268,7 @@ static Sys_var_plugin Sys_storage_engine(
static
Sys_var_plugin
Sys_default_tmp_storage_engine
(
static
Sys_var_plugin
Sys_default_tmp_storage_engine
(
"default_tmp_storage_engine"
,
"The default storage engine for user-created temporary tables"
,
"default_tmp_storage_engine"
,
"The default storage engine for user-created temporary tables"
,
SESSION_VAR
(
tmp_table_plugin
),
NO_CMD_LINE
,
SESSION_VAR
(
tmp_table_plugin
),
NO_CMD_LINE
,
MYSQL_STORAGE_ENGINE_PLUGIN
,
DEFAULT
(
&
default_tmp_storage_engine
),
MYSQL_STORAGE_ENGINE_PLUGIN
,
DEFAULT
(
&
default_tmp_storage_engine
));
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
);
#if defined(ENABLED_DEBUG_SYNC)
#if defined(ENABLED_DEBUG_SYNC)
/*
/*
...
@@ -4212,9 +4209,7 @@ static Sys_var_uint Sys_slave_net_timeout(
...
@@ -4212,9 +4209,7 @@ static Sys_var_uint Sys_slave_net_timeout(
"slave_net_timeout"
,
"Number of seconds to wait for more data "
"slave_net_timeout"
,
"Number of seconds to wait for more data "
"from any master/slave connection before aborting the read"
,
"from any master/slave connection before aborting the read"
,
GLOBAL_VAR
(
slave_net_timeout
),
CMD_LINE
(
REQUIRED_ARG
),
GLOBAL_VAR
(
slave_net_timeout
),
CMD_LINE
(
REQUIRED_ARG
),
VALID_RANGE
(
1
,
LONG_TIMEOUT
),
DEFAULT
(
SLAVE_NET_TIMEOUT
),
BLOCK_SIZE
(
1
),
VALID_RANGE
(
1
,
LONG_TIMEOUT
),
DEFAULT
(
SLAVE_NET_TIMEOUT
),
BLOCK_SIZE
(
1
));
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
0
),
ON_UPDATE
(
0
));
/*
/*
...
@@ -4461,8 +4456,7 @@ static Sys_var_charptr Sys_wsrep_provider_options(
...
@@ -4461,8 +4456,7 @@ static Sys_var_charptr Sys_wsrep_provider_options(
static
Sys_var_charptr
Sys_wsrep_data_home_dir
(
static
Sys_var_charptr
Sys_wsrep_data_home_dir
(
"wsrep_data_home_dir"
,
"home directory for wsrep provider"
,
"wsrep_data_home_dir"
,
"home directory for wsrep provider"
,
READ_ONLY
GLOBAL_VAR
(
wsrep_data_home_dir
),
CMD_LINE
(
REQUIRED_ARG
),
READ_ONLY
GLOBAL_VAR
(
wsrep_data_home_dir
),
CMD_LINE
(
REQUIRED_ARG
),
IN_FS_CHARSET
,
DEFAULT
(
""
),
IN_FS_CHARSET
,
DEFAULT
(
""
));
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
);
static
Sys_var_charptr
Sys_wsrep_cluster_name
(
static
Sys_var_charptr
Sys_wsrep_cluster_name
(
"wsrep_cluster_name"
,
"Name for the cluster"
,
"wsrep_cluster_name"
,
"Name for the cluster"
,
...
@@ -4499,8 +4493,7 @@ static Sys_var_charptr Sys_wsrep_node_address (
...
@@ -4499,8 +4493,7 @@ static Sys_var_charptr Sys_wsrep_node_address (
static
Sys_var_charptr
Sys_wsrep_node_incoming_address
(
static
Sys_var_charptr
Sys_wsrep_node_incoming_address
(
"wsrep_node_incoming_address"
,
"Client connection address"
,
"wsrep_node_incoming_address"
,
"Client connection address"
,
PREALLOCATED
GLOBAL_VAR
(
wsrep_node_incoming_address
),
CMD_LINE
(
REQUIRED_ARG
),
PREALLOCATED
GLOBAL_VAR
(
wsrep_node_incoming_address
),
CMD_LINE
(
REQUIRED_ARG
),
IN_FS_CHARSET
,
DEFAULT
(
WSREP_NODE_INCOMING_AUTO
),
IN_FS_CHARSET
,
DEFAULT
(
WSREP_NODE_INCOMING_AUTO
));
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
);
static
Sys_var_ulong
Sys_wsrep_slave_threads
(
static
Sys_var_ulong
Sys_wsrep_slave_threads
(
"wsrep_slave_threads"
,
"Number of slave appliers to launch"
,
"wsrep_slave_threads"
,
"Number of slave appliers to launch"
,
...
@@ -4513,8 +4506,7 @@ static Sys_var_ulong Sys_wsrep_slave_threads(
...
@@ -4513,8 +4506,7 @@ static Sys_var_ulong Sys_wsrep_slave_threads(
static
Sys_var_charptr
Sys_wsrep_dbug_option
(
static
Sys_var_charptr
Sys_wsrep_dbug_option
(
"wsrep_dbug_option"
,
"DBUG options to provider library"
,
"wsrep_dbug_option"
,
"DBUG options to provider library"
,
GLOBAL_VAR
(
wsrep_dbug_option
),
CMD_LINE
(
REQUIRED_ARG
),
GLOBAL_VAR
(
wsrep_dbug_option
),
CMD_LINE
(
REQUIRED_ARG
),
IN_FS_CHARSET
,
DEFAULT
(
""
),
IN_FS_CHARSET
,
DEFAULT
(
""
));
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
);
static
Sys_var_mybool
Sys_wsrep_debug
(
static
Sys_var_mybool
Sys_wsrep_debug
(
"wsrep_debug"
,
"To enable debug level logging"
,
"wsrep_debug"
,
"To enable debug level logging"
,
...
@@ -4611,7 +4603,7 @@ static Sys_var_ulong Sys_wsrep_max_ws_rows (
...
@@ -4611,7 +4603,7 @@ static Sys_var_ulong Sys_wsrep_max_ws_rows (
static
Sys_var_charptr
Sys_wsrep_notify_cmd
(
static
Sys_var_charptr
Sys_wsrep_notify_cmd
(
"wsrep_notify_cmd"
,
""
,
"wsrep_notify_cmd"
,
""
,
GLOBAL_VAR
(
wsrep_notify_cmd
),
CMD_LINE
(
REQUIRED_ARG
),
GLOBAL_VAR
(
wsrep_notify_cmd
),
CMD_LINE
(
REQUIRED_ARG
),
IN_FS_CHARSET
,
DEFAULT
(
""
)
,
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
);
IN_FS_CHARSET
,
DEFAULT
(
""
));
static
Sys_var_mybool
Sys_wsrep_certify_nonPK
(
static
Sys_var_mybool
Sys_wsrep_certify_nonPK
(
"wsrep_certify_nonPK"
,
"Certify tables with no primary key"
,
"wsrep_certify_nonPK"
,
"Certify tables with no primary key"
,
...
@@ -4640,9 +4632,7 @@ static const char *wsrep_OSU_method_names[]= { "TOI", "RSU", NullS };
...
@@ -4640,9 +4632,7 @@ static const char *wsrep_OSU_method_names[]= { "TOI", "RSU", NullS };
static Sys_var_enum Sys_wsrep_OSU_method(
static Sys_var_enum Sys_wsrep_OSU_method(
"
wsrep_OSU_method
", "
Method
for
Online
Schema
Upgrade
",
"
wsrep_OSU_method
", "
Method
for
Online
Schema
Upgrade
",
GLOBAL_VAR(wsrep_OSU_method_options), CMD_LINE(OPT_ARG),
GLOBAL_VAR(wsrep_OSU_method_options), CMD_LINE(OPT_ARG),
wsrep_OSU_method_names, DEFAULT(WSREP_OSU_TOI),
wsrep_OSU_method_names, DEFAULT(WSREP_OSU_TOI));
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(0));
static PolyLock_mutex PLock_wsrep_desync(&LOCK_wsrep_desync);
static PolyLock_mutex PLock_wsrep_desync(&LOCK_wsrep_desync);
static Sys_var_mybool Sys_wsrep_desync (
static Sys_var_mybool Sys_wsrep_desync (
...
@@ -4657,9 +4647,7 @@ static Sys_var_enum Sys_wsrep_forced_binlog_format(
...
@@ -4657,9 +4647,7 @@ static Sys_var_enum Sys_wsrep_forced_binlog_format(
"
wsrep_forced_binlog_format
", "
binlog
format
to
take
effect
over
user
'
s
choice
",
"
wsrep_forced_binlog_format
", "
binlog
format
to
take
effect
over
user
'
s
choice
",
GLOBAL_VAR(wsrep_forced_binlog_format),
GLOBAL_VAR(wsrep_forced_binlog_format),
CMD_LINE(REQUIRED_ARG, OPT_BINLOG_FORMAT),
CMD_LINE(REQUIRED_ARG, OPT_BINLOG_FORMAT),
wsrep_binlog_format_names, DEFAULT(BINLOG_FORMAT_UNSPEC),
wsrep_binlog_format_names, DEFAULT(BINLOG_FORMAT_UNSPEC));
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(0));
static Sys_var_mybool Sys_wsrep_recover_datadir(
static Sys_var_mybool Sys_wsrep_recover_datadir(
"
wsrep_recover
", "
Recover
database
state
after
crash
and
exit
",
"
wsrep_recover
", "
Recover
database
state
after
crash
and
exit
",
...
...
sql/sys_vars.h
View file @
1a731af1
...
@@ -1981,8 +1981,8 @@ class Sys_var_replicate_events_marked_for_skip: public Sys_var_enum
...
@@ -1981,8 +1981,8 @@ class Sys_var_replicate_events_marked_for_skip: public Sys_var_enum
Sys_var_replicate_events_marked_for_skip
(
const
char
*
name_arg
,
Sys_var_replicate_events_marked_for_skip
(
const
char
*
name_arg
,
const
char
*
comment
,
int
flag_args
,
ptrdiff_t
off
,
size_t
size
,
const
char
*
comment
,
int
flag_args
,
ptrdiff_t
off
,
size_t
size
,
CMD_LINE
getopt
,
CMD_LINE
getopt
,
const
char
*
values
[],
uint
def_val
,
PolyLock
*
lock
,
const
char
*
values
[],
uint
def_val
,
PolyLock
*
lock
=
0
,
enum
binlog_status_enum
binlog_status_arg
)
enum
binlog_status_enum
binlog_status_arg
=
VARIABLE_NOT_IN_BINLOG
)
:
Sys_var_enum
(
name_arg
,
comment
,
flag_args
,
off
,
size
,
getopt
,
:
Sys_var_enum
(
name_arg
,
comment
,
flag_args
,
off
,
size
,
getopt
,
values
,
def_val
,
lock
,
binlog_status_arg
)
values
,
def_val
,
lock
,
binlog_status_arg
)
{}
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment