summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-07-28 15:49:59 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-07-28 15:49:59 -0400
commit67480fc5fd7fafc5838a6b8230100a3fc4810481 (patch)
tree0be984d2623f11a13e7b923fc9894b4896ae9cd4 /sql
parentb522c71e4be54708dc935f0ad5347fd4b06199ef (diff)
downloadmariadb-git-67480fc5fd7fafc5838a6b8230100a3fc4810481.tar.gz
MDEV-10429: sys_vars.sysvars_wsrep fails in buildbot on host 'work' (valgrind builder)
- Fixed the test - Improved comment for wsrep_drupal_282555_workaround
Diffstat (limited to 'sql')
-rw-r--r--sql/sys_vars.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index c733976452c..1943408678c 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -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(