Commit 5c8e628d authored by Alexey Yurchenko's avatar Alexey Yurchenko Committed by Jan Lindström

wsrep-lib update: bugfixes, cleanups, event API, state transition cleanups

Don't switch state to DONOR in `wsrep_sst_donate()` - wsrep-lib does it now
parent e8a91c18
......@@ -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();
......
......@@ -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);
......
......@@ -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);
......
Subproject commit 22921e7082ddfb45222f21a585aa8b877e62aa8b
Subproject commit 14b3612a308132d819237bba322f3373ac5a5135
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment