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
e5a80a30
Commit
e5a80a30
authored
Nov 25, 2013
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-5277 - Ensure that all MySQL 5.6 options are supported by the
MariaDB 10.0 server
parent
66612e8f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
71 additions
and
16 deletions
+71
-16
mysql-test/r/mysqld--help.result
mysql-test/r/mysqld--help.result
+0
-4
mysql-test/suite/multi_source/info_logs-master.opt
mysql-test/suite/multi_source/info_logs-master.opt
+1
-1
mysql-test/suite/sys_vars/disabled.def
mysql-test/suite/sys_vars/disabled.def
+1
-1
mysys/my_getopt.c
mysys/my_getopt.c
+2
-0
sql/mysqld.cc
sql/mysqld.cc
+65
-1
sql/mysqld.h
sql/mysqld.h
+2
-0
sql/sys_vars.cc
sql/sys_vars.cc
+0
-9
No files found.
mysql-test/r/mysqld--help.result
View file @
e5a80a30
...
@@ -949,9 +949,6 @@ The following options may be given as the first argument:
...
@@ -949,9 +949,6 @@ The following options may be given as the first argument:
The number of cached table definitions
The number of cached table definitions
--table-open-cache=#
--table-open-cache=#
The number of cached open tables
The number of cached open tables
--table-open-cache-instances=#
MySQL 5.6 compatible option. Not used or needed in
MariaDB
--tc-heuristic-recover=name
--tc-heuristic-recover=name
Decision to use in heuristic recover process. Possible
Decision to use in heuristic recover process. Possible
values are COMMIT or ROLLBACK.
values are COMMIT or ROLLBACK.
...
@@ -1287,7 +1284,6 @@ sysdate-is-now FALSE
...
@@ -1287,7 +1284,6 @@ sysdate-is-now FALSE
table-cache 400
table-cache 400
table-definition-cache 400
table-definition-cache 400
table-open-cache 400
table-open-cache 400
table-open-cache-instances 1
tc-heuristic-recover COMMIT
tc-heuristic-recover COMMIT
thread-cache-size 0
thread-cache-size 0
thread-pool-idle-timeout 60
thread-pool-idle-timeout 60
...
...
mysql-test/suite/multi_source/info_logs-master.opt
View file @
e5a80a30
--relay-log=relay.bin --relay-log-info=relay.bin.info
--relay-log=relay.bin --relay-log-info
-file
=relay.bin.info
mysql-test/suite/sys_vars/disabled.def
View file @
e5a80a30
...
@@ -11,4 +11,4 @@
...
@@ -11,4 +11,4 @@
##############################################################################
##############################################################################
innodb_flush_checkpoint_debug_basic: removed from XtraDB-26.0
innodb_flush_checkpoint_debug_basic: removed from XtraDB-26.0
table_open_cache_instances_basic: no such variable in MariaDB
mysys/my_getopt.c
View file @
e5a80a30
...
@@ -1315,6 +1315,8 @@ void my_print_help(const struct my_option *options)
...
@@ -1315,6 +1315,8 @@ void my_print_help(const struct my_option *options)
for
(
optp
=
options
;
optp
->
name
;
optp
++
)
for
(
optp
=
options
;
optp
->
name
;
optp
++
)
{
{
if
(
!
optp
->
comment
)
continue
;
if
(
optp
->
id
&&
optp
->
id
<
256
)
if
(
optp
->
id
&&
optp
->
id
<
256
)
{
{
printf
(
" -%c%s"
,
optp
->
id
,
strlen
(
optp
->
name
)
?
", "
:
" "
);
printf
(
" -%c%s"
,
optp
->
id
,
strlen
(
optp
->
name
)
?
", "
:
" "
);
...
...
sql/mysqld.cc
View file @
e5a80a30
...
@@ -6609,6 +6609,19 @@ int handle_early_options()
...
@@ -6609,6 +6609,19 @@ int handle_early_options()
}
}
#define MYSQL_COMPATIBILITY_OPTION(option) \
{ option, OPT_MYSQL_COMPATIBILITY, \
0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
#define MYSQL_TO_BE_IMPLEMENTED_OPTION(option) \
{ option, OPT_MYSQL_TO_BE_IMPLEMENTED, \
0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
#define MYSQL_SUGGEST_ANALOG_OPTION(option, str) \
{ option, OPT_MYSQL_COMPATIBILITY, \
0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
/**
/**
System variables are automatically command-line options (few
System variables are automatically command-line options (few
exceptions are documented in sys_var.h), so don't need
exceptions are documented in sys_var.h), so don't need
...
@@ -7026,7 +7039,50 @@ struct my_option my_long_options[]=
...
@@ -7026,7 +7039,50 @@ struct my_option my_long_options[]=
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"table_cache"
,
0
,
"Deprecated; use --table-open-cache instead."
,
{
"table_cache"
,
0
,
"Deprecated; use --table-open-cache instead."
,
&
tc_size
,
&
tc_size
,
0
,
GET_ULONG
,
&
tc_size
,
&
tc_size
,
0
,
GET_ULONG
,
REQUIRED_ARG
,
TABLE_OPEN_CACHE_DEFAULT
,
1
,
512
*
1024L
,
0
,
1
,
0
}
REQUIRED_ARG
,
TABLE_OPEN_CACHE_DEFAULT
,
1
,
512
*
1024L
,
0
,
1
,
0
},
/* The following options exist in 5.6 but not in 10.0 */
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"default-tmp-storage-engine"
),
MYSQL_COMPATIBILITY_OPTION
(
"log-raw"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"default-authentication-plugin"
),
MYSQL_COMPATIBILITY_OPTION
(
"binlog-max-flush-queue-time"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"binlog-row-image"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"explicit-defaults-for-timestamp"
),
MYSQL_COMPATIBILITY_OPTION
(
"master-info-repository"
),
MYSQL_COMPATIBILITY_OPTION
(
"relay-log-info-repository"
),
MYSQL_SUGGEST_ANALOG_OPTION
(
"binlog-rows-query-log-events"
,
"--binlog-annotate-row-events"
),
MYSQL_COMPATIBILITY_OPTION
(
"binlog-order-commits"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"log-throttle-queries-not-using-indexes"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"end-markers-in-json"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"optimizer-trace"
),
// OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"optimizer-trace-features"
),
// OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"optimizer-trace-offset"
),
// OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"optimizer-trace-limit"
),
// OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"optimizer-trace-max-mem-size"
),
// OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"eq-range-index-dive-limit"
),
MYSQL_COMPATIBILITY_OPTION
(
"server-id-bits"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"slave-rows-search-algorithms"
),
// HAVE_REPLICATION
MYSQL_COMPATIBILITY_OPTION
(
"table-open-cache-instances"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"slave-allow-batching"
),
// HAVE_REPLICATION
MYSQL_COMPATIBILITY_OPTION
(
"slave-checkpoint-period"
),
// HAVE_REPLICATION
MYSQL_COMPATIBILITY_OPTION
(
"slave-checkpoint-group"
),
// HAVE_REPLICATION
MYSQL_SUGGEST_ANALOG_OPTION
(
"slave-parallel-workers"
,
"--slave-parallel-threads"
),
// HAVE_REPLICATION
MYSQL_SUGGEST_ANALOG_OPTION
(
"slave-pending-jobs-size-max"
,
"--slave-parallel-max-queued"
),
// HAVE_REPLICATION
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"disconnect-on-expired-password"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"sha256-password-private-key-path"
),
// HAVE_OPENSSL && !HAVE_YASSL
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"sha256-password-public-key-path"
),
// HAVE_OPENSSL && !HAVE_YASSL
/* The following options exist in 5.5 and 5.6 but not in 10.0 */
MYSQL_SUGGEST_ANALOG_OPTION
(
"abort-slave-event-count"
,
"--debug-abort-slave-event-count"
),
MYSQL_SUGGEST_ANALOG_OPTION
(
"disconnect-slave-event-count"
,
"--debug-disconnect-slave-event-count"
),
MYSQL_SUGGEST_ANALOG_OPTION
(
"exit-info"
,
"--debug-exit-info"
),
MYSQL_SUGGEST_ANALOG_OPTION
(
"max-binlog-dump-events"
,
"--debug-max-binlog-dump-events"
),
MYSQL_SUGGEST_ANALOG_OPTION
(
"sporadic-binlog-dump-fail"
,
"--debug-sporadic-binlog-dump-fail"
),
MYSQL_COMPATIBILITY_OPTION
(
"new"
),
/* The following options were added after 5.6.10 */
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"rpl-stop-slave-timeout"
),
MYSQL_TO_BE_IMPLEMENTED_OPTION
(
"validate-user-plugins"
)
// NO_EMBEDDED_ACCESS_CHECKS
};
};
static
int
show_queries
(
THD
*
thd
,
SHOW_VAR
*
var
,
char
*
buff
)
static
int
show_queries
(
THD
*
thd
,
SHOW_VAR
*
var
,
char
*
buff
)
...
@@ -8188,6 +8244,14 @@ mysqld_get_one_option(int optid,
...
@@ -8188,6 +8244,14 @@ mysqld_get_one_option(int optid,
"for compatiblity with old my.cnf files."
,
"for compatiblity with old my.cnf files."
,
opt
->
name
);
opt
->
name
);
break
;
break
;
case
OPT_MYSQL_COMPATIBILITY
:
sql_print_warning
(
"'%s' is MySQL 5.6 compatible option. Not used or needed "
"in MariaDB."
,
opt
->
name
);
break
;
case
OPT_MYSQL_TO_BE_IMPLEMENTED
:
sql_print_warning
(
"'%s' is MySQL 5.6 compatible option. To be implemented "
"in later versions."
,
opt
->
name
);
break
;
case
'a'
:
case
'a'
:
global_system_variables
.
sql_mode
=
MODE_ANSI
;
global_system_variables
.
sql_mode
=
MODE_ANSI
;
global_system_variables
.
tx_isolation
=
ISO_SERIALIZABLE
;
global_system_variables
.
tx_isolation
=
ISO_SERIALIZABLE
;
...
...
sql/mysqld.h
View file @
e5a80a30
...
@@ -575,6 +575,8 @@ enum options_mysqld
...
@@ -575,6 +575,8 @@ enum options_mysqld
OPT_SSL_KEY
,
OPT_SSL_KEY
,
OPT_UPDATE_LOG
,
OPT_UPDATE_LOG
,
OPT_WANT_CORE
,
OPT_WANT_CORE
,
OPT_MYSQL_COMPATIBILITY
,
OPT_MYSQL_TO_BE_IMPLEMENTED
,
OPT_which_is_always_the_last
OPT_which_is_always_the_last
};
};
#endif
#endif
...
...
sql/sys_vars.cc
View file @
e5a80a30
...
@@ -2865,15 +2865,6 @@ static Sys_var_ulong Sys_table_cache_size(
...
@@ -2865,15 +2865,6 @@ static Sys_var_ulong Sys_table_cache_size(
VALID_RANGE
(
1
,
512
*
1024
),
DEFAULT
(
TABLE_OPEN_CACHE_DEFAULT
),
VALID_RANGE
(
1
,
512
*
1024
),
DEFAULT
(
TABLE_OPEN_CACHE_DEFAULT
),
BLOCK_SIZE
(
1
));
BLOCK_SIZE
(
1
));
static
ulong
table_cache_instances
;
static
Sys_var_ulong
Sys_table_cache_instances
(
"table_open_cache_instances"
,
"MySQL 5.6 compatible option. Not used or needed in MariaDB"
,
READ_ONLY
GLOBAL_VAR
(
table_cache_instances
),
CMD_LINE
(
REQUIRED_ARG
),
VALID_RANGE
(
1
,
64
),
DEFAULT
(
1
),
BLOCK_SIZE
(
1
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
NULL
),
ON_UPDATE
(
NULL
),
NULL
);
static
Sys_var_ulong
Sys_thread_cache_size
(
static
Sys_var_ulong
Sys_thread_cache_size
(
"thread_cache_size"
,
"thread_cache_size"
,
"How many threads we should keep in a cache for reuse"
,
"How many threads we should keep in a cache for reuse"
,
...
...
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