1
0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00

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

- Fixed the test
- Improved comment for wsrep_drupal_282555_workaround
This commit is contained in:
Nirbhay Choubey
2016-07-28 15:49:59 -04:00
parent b522c71e4b
commit 67480fc5fd
3 changed files with 8 additions and 5 deletions

View File

@@ -162,7 +162,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
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_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL

View File

@@ -3,7 +3,9 @@
--let $datadir = `SELECT @@datadir`
--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
select * from information_schema.system_variables
where variable_name like 'wsrep%'

View File

@@ -4782,9 +4782,10 @@ static Sys_var_mybool Sys_wsrep_auto_increment_control(
CMD_LINE(OPT_ARG), DEFAULT(TRUE));
static Sys_var_mybool Sys_wsrep_drupal_282555_workaround(
"wsrep_drupal_282555_workaround", "To use a workaround for"
"bad autoincrement value",
GLOBAL_VAR(wsrep_drupal_282555_workaround),
"wsrep_drupal_282555_workaround", "Enable a workaround to handle the "
"cases where inserting a DEFAULT value into an auto-increment column "
"could fail with duplicate key error",
GLOBAL_VAR(wsrep_drupal_282555_workaround),
CMD_LINE(OPT_ARG), DEFAULT(FALSE));
static Sys_var_charptr sys_wsrep_sst_method(