diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2013-11-29 13:03:00 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2013-11-29 13:03:00 -0500 |
| commit | e4f5e49cd6de1c9e4899a6e6f5c6666434e02437 (patch) | |
| tree | 64a37e2c832a63447f0e87e32c716099c453a17b /sql/wsrep_mysqld.h | |
| parent | 6271c06a73ce1065ac53a554e42a0049bf77eb53 (diff) | |
| download | mariadb-git-e4f5e49cd6de1c9e4899a6e6f5c6666434e02437.tar.gz | |
MDEV#4109: Galera: Valgrind warnings "blocks are still
reachable" in wsrep_init_startup on MTR tests
The initialization & de-initialization of wsrep plugin is solely
controlled by wsrep_on system variable. Now, as wsrep_on is ON by
default, the plugin gets initialized during server start. However,
there would be a leakage in case wsrep_on is turned off before plugin's
deinitialization (while server is shutting down) takes place, in which
case the deinit routine will not be invoked.
In this particular case, wsrep_on is turned off as no wsrep provider
has been specified & thus the valgrind warnings.
Fixed by introducing a flag which tracks and now controls the
(de|)initialization of the wsrep plugin instead on wsrep_on.
Added necessary asserts.
main.connect [ pass ] 16534
valgrind_report [ pass ]
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 20d356a22a9..37e72123c59 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -117,6 +117,9 @@ extern const char* wsrep_provider_vendor; extern int wsrep_show_status(THD *thd, SHOW_VAR *var, char *buff); extern void wsrep_free_status(THD *thd); +// Other wsrep global variables +extern my_bool wsrep_inited; // whether wsrep is initialized ? + #define WSREP_SST_ADDRESS_AUTO "AUTO" #define WSREP_NODE_INCOMING_AUTO "AUTO" |