diff options
| author | Alexey Yurchenko <alexey.yurchenko@galeracluster.com> | 2021-12-02 22:26:01 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-12-08 13:16:23 +0200 |
| commit | 5c8e628dda8be24544941b1892ce24c33b14e004 (patch) | |
| tree | 0e174c42381fc0441618aef0228a1e786d945d23 | |
| parent | e8a91c18ea136f54a53ae19c6f41482a1b855cff (diff) | |
| download | mariadb-git-bb-10.4-wsrep-lib.tar.gz | |
wsrep-lib update: bugfixes, cleanups, event API, state transition cleanupsbb-10.4-wsrep-lib
Don't switch state to DONOR in `wsrep_sst_donate()` - wsrep-lib does it now
| -rw-r--r-- | sql/wsrep_mysqld.cc | 14 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 | ||||
| -rw-r--r-- | sql/wsrep_sst.cc | 5 | ||||
| m--------- | wsrep-lib | 0 |
4 files changed, 0 insertions, 21 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 3fc03054014..a2856b5034d 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2623,20 +2623,6 @@ void wsrep_wait_appliers_close(THD *thd) */ } -void -wsrep_last_committed_id(wsrep_gtid_t* gtid) -{ - wsrep::gtid ret= Wsrep_server_state::instance().last_committed_gtid(); - memcpy(gtid->uuid.data, ret.id().data(), sizeof(gtid->uuid.data)); - gtid->seqno= ret.seqno().get(); -} - -void -wsrep_node_uuid(wsrep_uuid_t& uuid) -{ - uuid= node_uuid; -} - int wsrep_must_ignore_error(THD* thd) { const int error= thd->get_stmt_da()->sql_errno(); diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index db3e9b09b51..279f2bd44aa 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -210,7 +210,6 @@ extern bool wsrep_must_sync_wait (THD* thd, uint mask= WSREP_SYNC_WAIT_BEFORE_RE extern bool wsrep_sync_wait (THD* thd, uint mask= WSREP_SYNC_WAIT_BEFORE_READ); extern enum wsrep::provider::status wsrep_sync_wait_upto (THD* thd, wsrep_gtid_t* upto, int timeout); -extern void wsrep_last_committed_id (wsrep_gtid_t* gtid); extern int wsrep_check_opts(); extern void wsrep_prepend_PATH (const char* path); extern bool wsrep_append_fk_parent_table(THD* thd, TABLE_LIST* table, wsrep::key_array* keys); @@ -382,7 +381,6 @@ bool wsrep_node_is_synced(); void wsrep_init_SR(); void wsrep_verify_SE_checkpoint(const wsrep_uuid_t& uuid, wsrep_seqno_t seqno); int wsrep_replay_from_SR_store(THD*, const wsrep_trx_meta_t&); -void wsrep_node_uuid(wsrep_uuid_t&); class Log_event; int wsrep_ignored_error_code(Log_event* ev, int error); diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 88bee67a2fc..a11c2fcb78a 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -1892,11 +1892,6 @@ int wsrep_sst_donate(const std::string& msg, const wsrep::gtid& current_gtid, const bool bypass) { - /* This will be reset when sync callback is called. - * Should we set wsrep_ready to FALSE here too? */ - - wsrep_config_state->set(wsrep::server_state::s_donor); - const char* method= msg.data(); size_t method_len= strlen (method); diff --git a/wsrep-lib b/wsrep-lib -Subproject 22921e7082ddfb45222f21a585aa8b877e62aa8 +Subproject 14b3612a308132d819237bba322f3373ac5a513 |