diff options
| author | Anel Husakovic <anel@mariadb.org> | 2023-03-08 12:59:50 +0100 |
|---|---|---|
| committer | Anel <an3l@users.noreply.github.com> | 2023-03-23 13:39:46 +0100 |
| commit | c596ad734daad090a766d71ef0446444fdc83904 (patch) | |
| tree | fe84d66ff5a432c8fe4aeec65b15568af4fb539e /sql | |
| parent | ff3d4395d808b6421d2e0714e10d48c7aa2f3c3a (diff) | |
| download | mariadb-git-c596ad734daad090a766d71ef0446444fdc83904.tar.gz | |
MDEV-30269: Remove rpl_semi_sync_[slave,master] usage in code
- Description:
- Before 10.3.8 semisync was a plugin that is built into the server with
MDEV-13073,starting with commit cbc71485e24c31fc822277625512e55c2a8b650b.
There are still some usage of `rpl_semi_sync_master` in mtr.
Note:
- To recognize the replica in the `dump_thread`, replica is creating
local variable `rpl_semi_sync_slave` (the keyword of plugin) in
function `request_transmit`, that is catched by primary in
`is_semi_sync_slave()`. This is the user variable and as such not
related to the obsolete plugin.
- Found in `sys_vars.all_vars` and `rpl_semi_sync_wait_point` tests,
usage of plugins `rpl_semi_sync_master`, `rpl_semi_sync_slave`.
The former test is disabled by default (`sys_vars/disabled.def`)
and marked as `obsolete`, however this patch will remove the queries.
- Add cosmetic fixes to semisync codebase
Reviewer: <brandon.nesterenko@mariadb.com>
Closes PR #2528, PR #2380
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/semisync_master.cc | 6 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc index ee4a0161085..63a50539e50 100644 --- a/sql/semisync_master.cc +++ b/sql/semisync_master.cc @@ -317,8 +317,8 @@ void Active_tranx::clear_active_tranx_nodes(const char *log_file_name, /******************************************************************************* * - * <Repl_semi_sync_master> class: the basic code layer for syncsync master. - * <Repl_semi_sync_slave> class: the basic code layer for syncsync slave. + * <Repl_semi_sync_master> class: the basic code layer for semisync master. + * <Repl_semi_sync_slave> class: the basic code layer for semisync slave. * * The most important functions during semi-syn replication listed: * @@ -809,8 +809,6 @@ void Repl_semi_sync_master::dump_end(THD* thd) remove_slave(); ack_receiver.remove_slave(thd); - - return; } int Repl_semi_sync_master::commit_trx(const char* trx_wait_binlog_name, diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 82663c3ca2c..d9b93742195 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -433,7 +433,7 @@ static int send_file(THD *thd) /** Internal to mysql_binlog_send() routine that recalculates checksum for - 1. FD event (asserted) that needs additional arranment prior sending to slave. + 1. FD event (asserted) that needs additional arrangement prior sending to slave. 2. Start_encryption_log_event whose Ignored flag is set TODO DBUG_ASSERT can be removed if this function is used for more general cases */ |