database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-27 09:10:47 +03:00
parent dd07cfcecd 90a306a7ab
commit 559efad44e
19 changed files with 666 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/suite/rpl/r/rpl_semi_sync_slave_compressed_protocol.result Normal file
View File

@@ -0,0 +1,19 @@
include/master-slave.inc
[connection master]
SET @@GLOBAL.rpl_semi_sync_master_enabled = 1;
connection slave;
include/stop_slave.inc
SET @@GLOBAL.rpl_semi_sync_slave_enabled = 1;
include/start_slave.inc
connection master;
CREATE TABLE t1 (i INT);
DROP TABLE t1;
include/rpl_sync.inc
include/assert_grep.inc [Check that there is no 'Read semi-sync reply magic number error' in error log.]
connection master;
SET @@GLOBAL. rpl_semi_sync_master_enabled = $sav_enabled_master;
connection slave;
include/stop_slave.inc
SET @@GLOBAL. rpl_semi_sync_slave_enabled = $sav_enabled_slave;
include/start_slave.inc
include/rpl_end.inc

1
mysql-test/suite/rpl/t/rpl_semi_sync_slave_compressed_protocol-slave.opt Normal file
View File

@@ -0,0 +1 @@
--slave_compressed_protocol

55
mysql-test/suite/rpl/t/rpl_semi_sync_slave_compressed_protocol.test Normal file
View File

@@ -0,0 +1,55 @@
################################################################################
# Bug#26027024 SLAVE_COMPRESSED_PROTOCOL DOESN'T WORK WITH SEMI-SYNC
# REPLICATION IN MYSQL-5.7
#
# Steps to reproduce:
# 1) Set slave_compressed_protocol ON on Slave.
# 2) Do some sample work on Master
# 3) After the work is synced on Slave, check that there is no error
# (Read semi-sync reply magic number error) on Slave.
# 4) Cleanup
################################################################################
# Test is independent of Binlog format. One of the three formats is enough
# for testing. Choosing 'Row' format.
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
--let $sav_enabled_master=`SELECT @@GLOBAL.rpl_semi_sync_master_enabled `
SET @@GLOBAL.rpl_semi_sync_master_enabled = 1;
--connection slave
source include/stop_slave.inc;
--let $sav_enabled_slave=`SELECT @@GLOBAL.rpl_semi_sync_slave_enabled `
SET @@GLOBAL.rpl_semi_sync_slave_enabled = 1;
source include/start_slave.inc;
--connection master
# Do some sample work on Master with slave_compressed_protocol ON.
# (slave_compressed_protocol is set to ON in -slave.opt file of this test.)
CREATE TABLE t1 (i INT);
DROP TABLE t1;
# Make sure sync is done, so that next 'assert' step can be executed without
# any issues.
--source include/rpl_sync.inc
# Without the fix, the test would have generated few
# errors in the error log. With the fix, test will
# pass without any errors in the error log.
--let $assert_text= Check that there is no 'Read semi-sync reply magic number error' in error log.
--let $assert_select=Read semi-sync reply magic number error
--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
--let $assert_count= 0
--let $assert_only_after = CURRENT_TEST:rpl.rpl_semi_sync_slave_compressed_protocol.test
--source include/assert_grep.inc
--connection master
--evalp SET @@GLOBAL. rpl_semi_sync_master_enabled = $sav_enabled_master
--connection slave
source include/stop_slave.inc;
--evalp SET @@GLOBAL. rpl_semi_sync_slave_enabled = $sav_enabled_slave
source include/start_slave.inc;
# Cleanup
--source include/rpl_end.inc