diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-07-24 14:54:50 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-07-24 14:54:50 +0300 |
| commit | c863159c320008676aff978a7cdde5732678f975 (patch) | |
| tree | c27120ce7a1aa6ea6199a203f8a40f1c74fe8d1d /sql/wsrep_mysqld.h | |
| parent | f99fe68b4fb7ca1715d059d283e50f050f692294 (diff) | |
| download | mariadb-git-c863159c320008676aff978a7cdde5732678f975.tar.gz | |
MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_data
Problem was that binlog_hton was not initialized fully when needed
i.e. when wsrep_on = true.
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 94c97f04aab..ee96a304f7b 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -204,6 +204,9 @@ extern void wsrep_prepend_PATH (const char* path); extern wsrep_seqno_t wsrep_locked_seqno; #define WSREP_ON \ + (global_system_variables.wsrep_on) + +#define WSREP_ON_NEW \ ((global_system_variables.wsrep_on) && \ wsrep_provider && \ strcmp(wsrep_provider, WSREP_NONE)) |