database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity

Fixed a typo and updated mysqld--help test result.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-06-25 00:45:12 -04:00
parent 9a0b80c968
commit c039d9667e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/mysqld--help.result
View File

@@ -1108,6 +1108,11 @@ The following options may be given as the first argument:
--wsrep-retry-autocommit=# --wsrep-retry-autocommit=#
Max number of times to retry a failed autocommit Max number of times to retry a failed autocommit
statement statement
--wsrep-slave-FK-checks
Should slave thread do foreign key constraint checks
(Defaults to on; use --skip-wsrep-slave-FK-checks to disable.)
--wsrep-slave-UK-checks
Should slave thread do secondary index uniqueness checks
--wsrep-slave-threads=# --wsrep-slave-threads=#
Number of slave appliers to launch Number of slave appliers to launch
--wsrep-sst-auth=name --wsrep-sst-auth=name
@@ -1448,6 +1453,8 @@ wsrep-recover FALSE
wsrep-replicate-myisam FALSE wsrep-replicate-myisam FALSE
wsrep-restart-slave FALSE wsrep-restart-slave FALSE
wsrep-retry-autocommit 1 wsrep-retry-autocommit 1
wsrep-slave-FK-checks TRUE
wsrep-slave-UK-checks FALSE
wsrep-slave-threads 1 wsrep-slave-threads 1
wsrep-sst-auth (No default value) wsrep-sst-auth (No default value)
wsrep-sst-donor wsrep-sst-donor

2
sql/sys_vars.cc
View File

@@ -4720,7 +4720,7 @@ static Sys_var_mybool Sys_wsrep_slave_FK_checks(
static Sys_var_mybool Sys_wsrep_slave_UK_checks( static Sys_var_mybool Sys_wsrep_slave_UK_checks(
"wsrep_slave_UK_checks", "Should slave thread do " "wsrep_slave_UK_checks", "Should slave thread do "
"secondary index uniqueness chesks", "secondary index uniqueness checks",
GLOBAL_VAR(wsrep_slave_UK_checks), GLOBAL_VAR(wsrep_slave_UK_checks),
CMD_LINE(OPT_ARG), DEFAULT(FALSE)); CMD_LINE(OPT_ARG), DEFAULT(FALSE));