diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
| commit | 7697bf0bd7e5b50c1071742ac90539be71f6eabe (patch) | |
| tree | 9c4f650d6961467da0bbda23e3697571c984832d /sql/wsrep_mysqld.h | |
| parent | 0686c34d22a5cbf93015012eaf77a4a977b63afb (diff) | |
| parent | 080da551ea171f8a43633ab27b56875938643dd0 (diff) | |
| download | mariadb-git-7697bf0bd7e5b50c1071742ac90539be71f6eabe.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Note: some tests fail, just as they failed before the merge!
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 3c36e88eb6d..26d3484b3b4 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -151,7 +151,6 @@ extern "C" query_id_t wsrep_thd_query_id(THD *thd); extern "C" query_id_t wsrep_thd_wsrep_last_query_id(THD *thd); extern "C" void wsrep_thd_set_wsrep_last_query_id(THD *thd, query_id_t id); - extern void wsrep_close_client_connections(my_bool wait_to_end); extern int wsrep_wait_committing_connections_close(int wait_time); extern void wsrep_close_applier(THD *thd); @@ -165,7 +164,6 @@ extern bool wsrep_start_replication(); extern bool wsrep_sync_wait(THD* thd, uint mask = WSREP_SYNC_WAIT_BEFORE_READ); extern int wsrep_check_opts(); extern void wsrep_prepend_PATH (const char* path); -/* some inline functions are defined in wsrep_mysqld_inl.h */ /* Other global variables */ extern wsrep_seqno_t wsrep_locked_seqno; |