database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MW-267

Browse Source 
Fix Galera crash at startup when compiled with gcc 6

Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
This commit is contained in:
Sachin Setiya
2017-04-18 11:50:43 +05:30
parent 19b9fe07f5
commit b8afa783bc
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/wsrep_mysqld.cc
View File

@ -83,7 +83,7 @@ my_bool wsrep_creating_startup_threads = 0;
*/ */
my_bool wsrep_inited = 0; // initialized ? my_bool wsrep_inited = 0; // initialized ?
static const wsrep_uuid_t cluster_uuid = WSREP_UUID_UNDEFINED; static wsrep_uuid_t cluster_uuid = WSREP_UUID_UNDEFINED;
const wsrep_uuid_t* wsrep_cluster_uuid() const wsrep_uuid_t* wsrep_cluster_uuid()
{ {
return &cluster_uuid; return &cluster_uuid;

1
sql/wsrep_mysqld.h
View File

@ -314,7 +314,6 @@ int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len);
int wsrep_create_event_query(THD *thd, uchar** buf, size_t* buf_len); int wsrep_create_event_query(THD *thd, uchar** buf, size_t* buf_len);
int wsrep_alter_event_query(THD *thd, uchar** buf, size_t* buf_len); int wsrep_alter_event_query(THD *thd, uchar** buf, size_t* buf_len);
const wsrep_uuid_t* wsrep_cluster_uuid();
struct xid_t; struct xid_t;
void wsrep_set_SE_checkpoint(xid_t*); void wsrep_set_SE_checkpoint(xid_t*);
void wsrep_get_SE_checkpoint(wsrep_uuid_t&, wsrep_seqno_t&); void wsrep_get_SE_checkpoint(wsrep_uuid_t&, wsrep_seqno_t&);