Commit 67480fc5 authored by Nirbhay Choubey's avatar Nirbhay Choubey

MDEV-10429: sys_vars.sysvars_wsrep fails in buildbot on host 'work' (valgrind builder)

- Fixed the test
- Improved comment for wsrep_drupal_282555_workaround
parent b522c71e
...@@ -162,7 +162,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -162,7 +162,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT To use a workaround forbad autoincrement value VARIABLE_COMMENT Enable a workaround to handle the cases where inserting a DEFAULT value into an auto-increment column could fail with duplicate key error
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
--let $datadir = `SELECT @@datadir` --let $datadir = `SELECT @@datadir`
--let $hostname = `SELECT @@hostname` --let $hostname = `SELECT @@hostname`
--replace_result $datadir DATADIR $hostname HOSTNAME --replace_result $datadir DATADIR
--let $hostname_regex=/^$hostname\$/HOSTNAME/
--replace_regex $hostname_regex
--vertical_results --vertical_results
select * from information_schema.system_variables select * from information_schema.system_variables
where variable_name like 'wsrep%' where variable_name like 'wsrep%'
......
...@@ -4782,9 +4782,10 @@ static Sys_var_mybool Sys_wsrep_auto_increment_control( ...@@ -4782,9 +4782,10 @@ static Sys_var_mybool Sys_wsrep_auto_increment_control(
CMD_LINE(OPT_ARG), DEFAULT(TRUE)); CMD_LINE(OPT_ARG), DEFAULT(TRUE));
static Sys_var_mybool Sys_wsrep_drupal_282555_workaround( static Sys_var_mybool Sys_wsrep_drupal_282555_workaround(
"wsrep_drupal_282555_workaround", "To use a workaround for" "wsrep_drupal_282555_workaround", "Enable a workaround to handle the "
"bad autoincrement value", "cases where inserting a DEFAULT value into an auto-increment column "
GLOBAL_VAR(wsrep_drupal_282555_workaround), "could fail with duplicate key error",
GLOBAL_VAR(wsrep_drupal_282555_workaround),
CMD_LINE(OPT_ARG), DEFAULT(FALSE)); CMD_LINE(OPT_ARG), DEFAULT(FALSE));
static Sys_var_charptr sys_wsrep_sst_method( static Sys_var_charptr sys_wsrep_sst_method(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment