diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-30 13:22:52 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-30 13:22:52 +0200 |
| commit | b0fe082b365d989fcf905e5c40c3fe60fd756858 (patch) | |
| tree | 46aa5d206fd37adfce09bff6bbc95bf458167128 /sql/wsrep_mysqld.h | |
| parent | 93ff64ebd7a7b2a534acc3ee8bf14cbfd8658d0f (diff) | |
| parent | 2ee9343c873ad31c2dd0d2175dec2ef3b48ca5ba (diff) | |
| download | mariadb-git-b0fe082b365d989fcf905e5c40c3fe60fd756858.tar.gz | |
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 49845a8fafb..4c98b9a624b 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -21,6 +21,7 @@ typedef struct st_mysql_show_var SHOW_VAR; #include <sql_priv.h> //#include "rpl_gtid.h" #include "../wsrep/wsrep_api.h" +#include "wsrep_mysqld_c.h" #define WSREP_UNDEFINED_TRX_ID ULONGLONG_MAX @@ -66,7 +67,6 @@ enum wsrep_consistency_check_mode { CONSISTENCY_CHECK_RUNNING, }; - // Global wsrep parameters extern wsrep_t* wsrep; |