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.cc | |
| 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.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 90b1c132ae9..b922d2b2857 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1877,7 +1877,7 @@ error: WSREP_ERROR("Failed to create/initialize system thread"); /* Abort if its the first applier/rollbacker thread. */ - if (wsrep_creating_startup_threads < 2) + if (wsrep_creating_startup_threads == 1) unireg_abort(1); else return NULL; @@ -2381,6 +2381,12 @@ int wsrep_thd_retry_counter(THD *thd) } +extern "C" bool wsrep_thd_skip_append_keys(THD *thd) +{ + return thd->wsrep_skip_append_keys; +} + + extern int wsrep_trx_order_before(THD *thd1, THD *thd2) { |