diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2018-01-24 13:07:35 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachinsetia1001@gmail.com> | 2018-01-24 13:07:35 +0530 |
| commit | 20a2cfa1f5c5e8a18cebf59985d15144b8caaeb0 (patch) | |
| tree | dc6bc2d34bbc8f9ae6e0b27b8f012eba86ab0b84 | |
| parent | 843503e90f902a0c4691467b294a5edc34cf9f21 (diff) | |
| download | mariadb-git-bb-5.5-galera-14311.tar.gz | |
MDEV-14311 wsrep.variables fails in buildbot with wrong resultbb-5.5-galera-14311
Removal of older code around wsrep_prev_slave_threads in
wsrep_slave_count_change_update.
Patch Credit:- Seppo
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 2 | ||||
| -rw-r--r-- | sql/wsrep_var.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 3093d8ba942..bce7daba5d9 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -28,7 +28,7 @@ call mtr.add_suppression("WSREP: Failed to get provider options"); --disable_query_log eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; --enable_query_log - +--sleep 4 --replace_regex /.*libgalera_smm.*/libgalera_smm.so/ SELECT @@global.wsrep_provider; SELECT @@global.wsrep_slave_threads; diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 6385fa926a2..62b7e1ad5e1 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -36,6 +36,8 @@ const char* wsrep_node_incoming_address = 0; const char* wsrep_start_position = 0; ulong wsrep_OSU_method_options; +extern ulong wsrep_running_threads; + int wsrep_init_vars() { wsrep_provider = my_strdup(WSREP_NONE, MYF(MY_WME)); @@ -479,6 +481,7 @@ bool wsrep_slave_threads_check (sys_var *self, THD* thd, set_var* var) bool wsrep_slave_threads_update (sys_var *self, THD* thd, enum_var_type type) { + wsrep_slave_count_change= wsrep_slave_threads - wsrep_running_threads + 1; if (wsrep_slave_count_change > 0) { wsrep_create_appliers(wsrep_slave_count_change); |