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

Merge branch '10.0-galera' into bb-10.1-serg

Browse Source
This commit is contained in:
Nirbhay Choubey
2016-02-24 01:21:40 -05:00
parent 88576b3a80 f67d6fccac
commit cceec7858f
71 changed files with 1574 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.h
View File

@ -3991,6 +3991,7 @@ public:
void *wsrep_apply_format;
char wsrep_info[128]; /* string for dynamic proc info */
bool wsrep_skip_append_keys;
wsrep_gtid_t wsrep_sync_wait_gtid;
#endif /* WITH_WSREP */
/* Handling of timeouts for commands */