Skip to content

Commit 9c1ec33

Browse files
nacarvalhonacarvalho
committed
WL#13392: Support for TLS 1.3 in Asynchronous Replication
WL#12361: "Support TLS 1.3 in the server and libmysql" implemented support for TLS 1.3 in the connections between MySQL clients and servers. It includes the connections established through asynchronous replication, which use the same library - libmysql, that is, a slave server can establish its connection to a master using TLS 1.3. Though the TLS 1.3 configuration was not implemented on replication connections, there is no user interface to a DBA set the allowed ciphersuites. The DBA can now restrict the master server's TLS configuration to TLS 1.3 and a single TLS 1.3 ciphersuite that is not enabled by default, e.g., --tls-version=TLSv1.3 and --tls-ciphersuites=TLS_AES_128_CCM_8_SHA256. Replication slaves cannot connect to the master with such configurations. This also breaks Group Replication incremental recovery since it uses a asynchronous replication channel. To allow such configuration this worklog will implement: 1. MASTER_TLS_CIPHERSUITES option on CHANGE MASTER command; 2. group_replication_recovery_tls_version plugin option; 3. group_replication_recovery_tls_ciphersuites plugin option. ReviewBoard: 22892
1 parent 89eb3a4 commit 9c1ec33

File tree

65 files changed

+1519
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1519
-65
lines changed

‎mysql-test/r/information_schema_keywords.result

+1
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ MASTER_SSL_CRL 0
335335
MASTER_SSL_CRLPATH 0
336336
MASTER_SSL_KEY 0
337337
MASTER_SSL_VERIFY_SERVER_CERT 1
338+
MASTER_TLS_CIPHERSUITES 0
338339
MASTER_TLS_VERSION 0
339340
MASTER_USER 0
340341
MASTER_ZSTD_COMPRESSION_LEVEL 0

‎mysql-test/r/mysqldump.result

+1
Original file line numberDiff line numberDiff line change
@@ -5326,6 +5326,7 @@ CREATE TABLE IF NOT EXISTS `slave_master_info` (
53265326
`Network_namespace` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Network namespace used for communication with the master server.',
53275327
`Master_compression_algorithm` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'Compression algorithm supported for data transfer between master and slave.',
53285328
`Master_zstd_compression_level` int(10) unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
5329+
`Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
53295330
PRIMARY KEY (`Channel_name`)
53305331
) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information';
53315332
/*!40101 SET character_set_client = @saved_cs_client */;

‎mysql-test/r/rewrite_slow_log.result

+9-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ SET PASSWORD FOR test_user2='azundris2' REPLACE 'azundris2';
1717
SET GLOBAL master_info_repository = 'TABLE';
1818
SET GLOBAL relay_log_info_repository = 'TABLE';
1919
CHANGE MASTER TO MASTER_PASSWORD='azundris3',
20+
MASTER_BIND = 'eth4n',
21+
MASTER_TLS_CIPHERSUITES = ''
22+
FOR CHANNEL 'chan_jackie';
23+
CHANGE MASTER TO MASTER_PASSWORD='azundris3',
2024
MASTER_CONNECT_RETRY = 1, MASTER_HEARTBEAT_PERIOD = 1.01,
2125
MASTER_LOG_FILE = 'master_log_name', MASTER_LOG_POS = 0,
2226
MASTER_SSL = 0, MASTER_SSL_CA = 'ca_file_name',
@@ -25,6 +29,7 @@ MASTER_SSL_CERT = 'cert_file_name', MASTER_SSL_KEY = 'key_file_name',
2529
MASTER_SSL_CIPHER = 'cipher_list', MASTER_SSL_VERIFY_SERVER_CERT = 1,
2630
MASTER_SSL_CRL = 'crl_file_name', MASTER_SSL_CRLPATH = 'crl_directory_name',
2731
IGNORE_SERVER_IDS = (99,100), MASTER_TLS_VERSION = 'TLSv1.2',
32+
MASTER_TLS_CIPHERSUITES = NULL,
2833
MASTER_BIND = 'eth4n', MASTER_RETRY_COUNT = 7,
2934
MASTER_DELAY = 4711, MASTER_AUTO_POSITION = 0 FOR CHANNEL 'chan_jackie';
3035
RESET SLAVE ALL;
@@ -53,7 +58,8 @@ count(*)=1 OR count(*)=2
5358
1
5459
SELECT sql_text FROM test_log WHERE sql_text LIKE 'CHANGE MASTER TO MASTER_BIND %';
5560
sql_text
56-
CHANGE MASTER TO MASTER_BIND = 'eth4n', MASTER_PASSWORD = <secret>, MASTER_CONNECT_RETRY = 1, MASTER_RETRY_COUNT = 7, MASTER_DELAY = 4711, MASTER_HEARTBEAT_PERIOD = 1.010000, MASTER_LOG_FILE = 'master_log_name', MASTER_LOG_POS = 4, MASTER_AUTO_POSITION = 0, MASTER_SSL = 0, MASTER_SSL_CA = 'ca_file_name', MASTER_SSL_CAPATH = 'ca_directory_name', MASTER_SSL_CERT = 'cert_file_name', MASTER_SSL_CRL = 'crl_file_name', MASTER_SSL_CRLPATH = 'crl_directory_name', MASTER_SSL_KEY = 'key_file_name', MASTER_SSL_CIPHER = 'cipher_list', MASTER_SSL_VERIFY_SERVER_CERT = 1, MASTER_TLS_VERSION = 'TLSv1.2', IGNORE_SERVER_IDS = ( 99, 100 ) FOR CHANNEL 'chan_jackie';
61+
CHANGE MASTER TO MASTER_BIND = 'eth4n', MASTER_PASSWORD = <secret>, MASTER_TLS_CIPHERSUITES = '' FOR CHANNEL 'chan_jackie';
62+
CHANGE MASTER TO MASTER_BIND = 'eth4n', MASTER_PASSWORD = <secret>, MASTER_CONNECT_RETRY = 1, MASTER_RETRY_COUNT = 7, MASTER_DELAY = 4711, MASTER_HEARTBEAT_PERIOD = 1.010000, MASTER_LOG_FILE = 'master_log_name', MASTER_LOG_POS = 4, MASTER_AUTO_POSITION = 0, MASTER_SSL = 0, MASTER_SSL_CA = 'ca_file_name', MASTER_SSL_CAPATH = 'ca_directory_name', MASTER_SSL_CERT = 'cert_file_name', MASTER_SSL_CRL = 'crl_file_name', MASTER_SSL_CRLPATH = 'crl_directory_name', MASTER_SSL_KEY = 'key_file_name', MASTER_SSL_CIPHER = 'cipher_list', MASTER_SSL_VERIFY_SERVER_CERT = 1, MASTER_TLS_VERSION = 'TLSv1.2', MASTER_TLS_CIPHERSUITES = NULL, IGNORE_SERVER_IDS = ( 99, 100 ) FOR CHANNEL 'chan_jackie';
5763
SELECT count(*) FROM test_log WHERE sql_text LIKE 'SET PASSWORD %' AND sql_text LIKE '%<secret>%';
5864
count(*)
5965
3
@@ -63,7 +69,8 @@ count(*)=1 OR count(*)=2
6369
1
6470
SELECT sql_text FROM test_log WHERE sql_text LIKE 'CHANGE MASTER TO MASTER_BIND %';
6571
sql_text
66-
CHANGE MASTER TO MASTER_BIND = 'eth4n', MASTER_PASSWORD = <secret>, MASTER_CONNECT_RETRY = 1, MASTER_RETRY_COUNT = 7, MASTER_DELAY = 4711, MASTER_HEARTBEAT_PERIOD = 1.010000, MASTER_LOG_FILE = 'master_log_name', MASTER_LOG_POS = 4, MASTER_AUTO_POSITION = 0, MASTER_SSL = 0, MASTER_SSL_CA = 'ca_file_name', MASTER_SSL_CAPATH = 'ca_directory_name', MASTER_SSL_CERT = 'cert_file_name', MASTER_SSL_CRL = 'crl_file_name', MASTER_SSL_CRLPATH = 'crl_directory_name', MASTER_SSL_KEY = 'key_file_name', MASTER_SSL_CIPHER = 'cipher_list', MASTER_SSL_VERIFY_SERVER_CERT = 1, MASTER_TLS_VERSION = 'TLSv1.2', IGNORE_SERVER_IDS = ( 99, 100 ) FOR CHANNEL 'chan_jackie';
72+
CHANGE MASTER TO MASTER_BIND = 'eth4n', MASTER_PASSWORD = <secret>, MASTER_TLS_CIPHERSUITES = '' FOR CHANNEL 'chan_jackie';
73+
CHANGE MASTER TO MASTER_BIND = 'eth4n', MASTER_PASSWORD = <secret>, MASTER_CONNECT_RETRY = 1, MASTER_RETRY_COUNT = 7, MASTER_DELAY = 4711, MASTER_HEARTBEAT_PERIOD = 1.010000, MASTER_LOG_FILE = 'master_log_name', MASTER_LOG_POS = 4, MASTER_AUTO_POSITION = 0, MASTER_SSL = 0, MASTER_SSL_CA = 'ca_file_name', MASTER_SSL_CAPATH = 'ca_directory_name', MASTER_SSL_CERT = 'cert_file_name', MASTER_SSL_CRL = 'crl_file_name', MASTER_SSL_CRLPATH = 'crl_directory_name', MASTER_SSL_KEY = 'key_file_name', MASTER_SSL_CIPHER = 'cipher_list', MASTER_SSL_VERIFY_SERVER_CERT = 1, MASTER_TLS_VERSION = 'TLSv1.2', MASTER_TLS_CIPHERSUITES = NULL, IGNORE_SERVER_IDS = ( 99, 100 ) FOR CHANNEL 'chan_jackie';
6774
SELECT count(*) FROM test_log WHERE sql_text LIKE 'SET PASSWORD %' AND sql_text LIKE '%<secret>%';
6875
count(*)
6976
3

‎mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json

+47-4
Original file line numberDiff line numberDiff line change
@@ -36750,6 +36750,42 @@
3675036750
"collation_id": X,
3675136751
"is_explicit_collation": false
3675236752
},
36753+
{
36754+
"name": "Tls_ciphersuites",
36755+
"type": 27,
36756+
"is_nullable": true,
36757+
"is_zerofill": false,
36758+
"is_unsigned": false,
36759+
"is_auto_increment": false,
36760+
"is_virtual": false,
36761+
"hidden": 1,
36762+
"ordinal_position": 31,
36763+
"char_length": 65535,
36764+
"numeric_precision": 0,
36765+
"numeric_scale": 0,
36766+
"numeric_scale_null": true,
36767+
"datetime_precision": 0,
36768+
"datetime_precision_null": 1,
36769+
"has_no_default": false,
36770+
"default_value_null": true,
36771+
"srs_id_null": true,
36772+
"srs_id": 0,
36773+
"default_value": "",
36774+
"default_value_utf8_null": true,
36775+
"default_value_utf8": "",
36776+
"default_option": "",
36777+
"update_option": "",
36778+
"comment": "Ciphersuites used for TLS 1.3 communication with the master server.",
36779+
"generation_expression": "",
36780+
"generation_expression_utf8": "",
36781+
"options": "interval_count=0;",
36782+
"se_private_data": "table_id=X",
36783+
"column_key": 1,
36784+
"column_type_utf8": "text",
36785+
"elements": [],
36786+
"collation_id": X,
36787+
"is_explicit_collation": true
36788+
},
3675336789
{
3675436790
"name": "DB_TRX_ID",
3675536791
"type": 10,
@@ -36759,7 +36795,7 @@
3675936795
"is_auto_increment": false,
3676036796
"is_virtual": false,
3676136797
"hidden": 2,
36762-
"ordinal_position": 31,
36798+
"ordinal_position": 32,
3676336799
"char_length": 6,
3676436800
"numeric_precision": 0,
3676536801
"numeric_scale": 0,
@@ -36795,7 +36831,7 @@
3679536831
"is_auto_increment": false,
3679636832
"is_virtual": false,
3679736833
"hidden": 2,
36798-
"ordinal_position": 32,
36834+
"ordinal_position": 33,
3679936835
"char_length": 7,
3680036836
"numeric_precision": 0,
3680136837
"numeric_scale": 0,
@@ -36865,14 +36901,14 @@
3686536901
"length": 4294967295,
3686636902
"order": 2,
3686736903
"hidden": true,
36868-
"column_opx": 30
36904+
"column_opx": 31
3686936905
},
3687036906
{
3687136907
"ordinal_position": 3,
3687236908
"length": 4294967295,
3687336909
"order": 2,
3687436910
"hidden": true,
36875-
"column_opx": 31
36911+
"column_opx": 32
3687636912
},
3687736913
{
3687836914
"ordinal_position": 4,
@@ -37076,6 +37112,13 @@
3707637112
"order": 2,
3707737113
"hidden": true,
3707837114
"column_opx": 29
37115+
},
37116+
{
37117+
"ordinal_position": 33,
37118+
"length": 4294967295,
37119+
"order": 2,
37120+
"hidden": true,
37121+
"column_opx": 30
3707937122
}
3708037123
],
3708137124
"tablespace_ref": "mysql"

‎mysql-test/std_data/dd/sdi/upgrade/mysql.json

+47-4
Original file line numberDiff line numberDiff line change
@@ -33743,6 +33743,42 @@
3374333743
"collation_id": X,
3374433744
"is_explicit_collation": false
3374533745
},
33746+
{
33747+
"name": "Tls_ciphersuites",
33748+
"type": 27,
33749+
"is_nullable": true,
33750+
"is_zerofill": false,
33751+
"is_unsigned": false,
33752+
"is_auto_increment": false,
33753+
"is_virtual": false,
33754+
"hidden": 1,
33755+
"ordinal_position": 31,
33756+
"char_length": 65535,
33757+
"numeric_precision": 0,
33758+
"numeric_scale": 0,
33759+
"numeric_scale_null": true,
33760+
"datetime_precision": 0,
33761+
"datetime_precision_null": 1,
33762+
"has_no_default": false,
33763+
"default_value_null": true,
33764+
"srs_id_null": true,
33765+
"srs_id": 0,
33766+
"default_value": "",
33767+
"default_value_utf8_null": true,
33768+
"default_value_utf8": "",
33769+
"default_option": "",
33770+
"update_option": "",
33771+
"comment": "Ciphersuites used for TLS 1.3 communication with the master server.",
33772+
"generation_expression": "",
33773+
"generation_expression_utf8": "",
33774+
"options": "interval_count=0;",
33775+
"se_private_data": "table_id=X",
33776+
"column_key": 1,
33777+
"column_type_utf8": "text",
33778+
"elements": [],
33779+
"collation_id": X,
33780+
"is_explicit_collation": true
33781+
},
3374633782
{
3374733783
"name": "DB_TRX_ID",
3374833784
"type": 10,
@@ -33752,7 +33788,7 @@
3375233788
"is_auto_increment": false,
3375333789
"is_virtual": false,
3375433790
"hidden": 2,
33755-
"ordinal_position": 31,
33791+
"ordinal_position": 32,
3375633792
"char_length": 6,
3375733793
"numeric_precision": 0,
3375833794
"numeric_scale": 0,
@@ -33788,7 +33824,7 @@
3378833824
"is_auto_increment": false,
3378933825
"is_virtual": false,
3379033826
"hidden": 2,
33791-
"ordinal_position": 32,
33827+
"ordinal_position": 33,
3379233828
"char_length": 7,
3379333829
"numeric_precision": 0,
3379433830
"numeric_scale": 0,
@@ -33858,14 +33894,14 @@
3385833894
"length": 4294967295,
3385933895
"order": 2,
3386033896
"hidden": true,
33861-
"column_opx": 30
33897+
"column_opx": 31
3386233898
},
3386333899
{
3386433900
"ordinal_position": 3,
3386533901
"length": 4294967295,
3386633902
"order": 2,
3386733903
"hidden": true,
33868-
"column_opx": 31
33904+
"column_opx": 32
3386933905
},
3387033906
{
3387133907
"ordinal_position": 4,
@@ -34069,6 +34105,13 @@
3406934105
"order": 2,
3407034106
"hidden": true,
3407134107
"column_opx": 29
34108+
},
34109+
{
34110+
"ordinal_position": 33,
34111+
"length": 4294967295,
34112+
"order": 2,
34113+
"hidden": true,
34114+
"column_opx": 30
3407234115
}
3407334116
],
3407434117
"tablespace_ref": "mysql"

‎mysql-test/suite/funcs_1/r/is_columns_mysql.result

+2
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ def mysql slave_master_info Get_public_key 27 NULL NO tinyint NULL NULL 3 0 NULL
163163
def mysql slave_master_info Network_namespace 28 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references Network namespace used for communication with the master server. NULL
164164
def mysql slave_master_info Master_compression_algorithm 29 NULL NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) select,insert,update,references Compression algorithm supported for data transfer between master and slave. NULL
165165
def mysql slave_master_info Master_zstd_compression_level 30 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references Compression level associated with zstd compression algorithm. NULL
166+
def mysql slave_master_info Tls_ciphersuites 31 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references Ciphersuites used for TLS 1.3 communication with the master server. NULL
166167
def mysql slave_relay_log_info Number_of_lines 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references Number of lines in the file or rows in the table. Used to version table definitions. NULL
167168
def mysql slave_relay_log_info Relay_log_name 2 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The name of the current relay log file. NULL
168169
def mysql slave_relay_log_info Relay_log_pos 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references The relay log position of the last executed event. NULL
@@ -501,6 +502,7 @@ NULL mysql slave_master_info Get_public_key tinyint NULL NULL NULL NULL tinyint(
501502
1.0000 mysql slave_master_info Network_namespace text 65535 65535 utf8 utf8_bin text
502503
3.0000 mysql slave_master_info Master_compression_algorithm char 64 192 utf8 utf8_bin char(64)
503504
NULL mysql slave_master_info Master_zstd_compression_level int NULL NULL NULL NULL int(10) unsigned
505+
1.0000 mysql slave_master_info Tls_ciphersuites text 65535 65535 utf8 utf8_bin text
504506
NULL mysql slave_relay_log_info Number_of_lines int NULL NULL NULL NULL int(10) unsigned
505507
1.0000 mysql slave_relay_log_info Relay_log_name text 65535 65535 utf8 utf8_bin text
506508
NULL mysql slave_relay_log_info Relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned

‎mysql-test/suite/group_replication/r/gr_perfschema.result

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@ SSL_CRL_PATH
5252
CONNECTION_RETRY_INTERVAL 60
5353
CONNECTION_RETRY_COUNT 1
5454
HEARTBEAT_INTERVAL 30.000
55-
TLS_VERSION
55+
TLS_VERSION TLSv1,TLSv1.1,TLSv1.2,TLSv1.3
5656
PUBLIC_KEY_PATH
5757
GET_PUBLIC_KEY NO
5858
NETWORK_NAMESPACE
5959
COMPRESSION_ALGORITHM uncompressed
6060
ZSTD_COMPRESSION_LEVEL 3
61+
TLS_CIPHERSUITES NULL
6162
#group_replication_applier channel configuration
6263
SELECT * FROM performance_schema.replication_connection_configuration WHERE channel_name LIKE "group_replication_applier";
6364
CHANNEL_NAME group_replication_applier
@@ -84,6 +85,7 @@ GET_PUBLIC_KEY NO
8485
NETWORK_NAMESPACE
8586
COMPRESSION_ALGORITHM uncompressed
8687
ZSTD_COMPRESSION_LEVEL 3
88+
TLS_CIPHERSUITES NULL
8789

8890
SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
8991
CHANNEL_NAME group_replication_applier
@@ -186,12 +188,13 @@ SSL_CRL_PATH
186188
CONNECTION_RETRY_INTERVAL 60
187189
CONNECTION_RETRY_COUNT 1
188190
HEARTBEAT_INTERVAL 30.000
189-
TLS_VERSION
191+
TLS_VERSION TLSv1,TLSv1.1,TLSv1.2,TLSv1.3
190192
PUBLIC_KEY_PATH
191193
GET_PUBLIC_KEY NO
192194
NETWORK_NAMESPACE
193195
COMPRESSION_ALGORITHM uncompressed
194196
ZSTD_COMPRESSION_LEVEL 3
197+
TLS_CIPHERSUITES NULL
195198
#group_replication_applier channel configuration
196199
SELECT * FROM performance_schema.replication_connection_configuration WHERE channel_name LIKE "group_replication_applier";
197200
CHANNEL_NAME group_replication_applier
@@ -218,6 +221,7 @@ GET_PUBLIC_KEY NO
218221
NETWORK_NAMESPACE
219222
COMPRESSION_ALGORITHM uncompressed
220223
ZSTD_COMPRESSION_LEVEL 3
224+
TLS_CIPHERSUITES NULL
221225

222226
SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
223227
CHANNEL_NAME group_replication_applier

‎mysql-test/suite/group_replication/r/gr_perfschema_parallel_applier.result

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ GET_PUBLIC_KEY NO
6262
NETWORK_NAMESPACE
6363
COMPRESSION_ALGORITHM uncompressed
6464
ZSTD_COMPRESSION_LEVEL 3
65+
TLS_CIPHERSUITES NULL
6566

6667
SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
6768
CHANNEL_NAME group_replication_applier
@@ -260,6 +261,7 @@ GET_PUBLIC_KEY NO
260261
NETWORK_NAMESPACE
261262
COMPRESSION_ALGORITHM uncompressed
262263
ZSTD_COMPRESSION_LEVEL 3
264+
TLS_CIPHERSUITES NULL
263265

264266
SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
265267
CHANNEL_NAME group_replication_applier

‎mysql-test/suite/group_replication/r/gr_persist_only_variables.result

+7-3
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ SET PERSIST_ONLY group_replication_recovery_ssl_crl = @@GLOBAL.group_replication
6666
SET PERSIST_ONLY group_replication_recovery_ssl_crlpath = @@GLOBAL.group_replication_recovery_ssl_crlpath;
6767
SET PERSIST_ONLY group_replication_recovery_ssl_key = @@GLOBAL.group_replication_recovery_ssl_key;
6868
SET PERSIST_ONLY group_replication_recovery_ssl_verify_server_cert = @@GLOBAL.group_replication_recovery_ssl_verify_server_cert;
69+
SET PERSIST_ONLY group_replication_recovery_tls_ciphersuites = @@GLOBAL.group_replication_recovery_tls_ciphersuites;
70+
SET PERSIST_ONLY group_replication_recovery_tls_version = @@GLOBAL.group_replication_recovery_tls_version;
6971
SET PERSIST_ONLY group_replication_recovery_use_ssl = @@GLOBAL.group_replication_recovery_use_ssl;
7072
SET PERSIST_ONLY group_replication_recovery_zstd_compression_level = @@GLOBAL.group_replication_recovery_zstd_compression_level;
7173
SET PERSIST_ONLY group_replication_single_primary_mode = @@GLOBAL.group_replication_single_primary_mode;
@@ -74,7 +76,7 @@ SET PERSIST_ONLY group_replication_start_on_boot = @@GLOBAL.group_replication_st
7476
SET PERSIST_ONLY group_replication_transaction_size_limit = @@GLOBAL.group_replication_transaction_size_limit;
7577
SET PERSIST_ONLY group_replication_unreachable_majority_timeout = @@GLOBAL.group_replication_unreachable_majority_timeout;
7678

77-
include/assert.inc ['Expect 53 persisted variables.']
79+
include/assert.inc ['Expect 55 persisted variables.']
7880

7981
############################################################
8082
# 2. Restart server, it must bootstrap the group and preserve
@@ -83,8 +85,8 @@ include/assert.inc ['Expect 53 persisted variables.']
8385
include/rpl_reconnect.inc
8486
include/gr_wait_for_member_state.inc
8587

86-
include/assert.inc ['Expect 53 persisted variables in persisted_variables table.']
87-
include/assert.inc ['Expect 53 persisted variables shown as PERSISTED in variables_info table.']
88+
include/assert.inc ['Expect 55 persisted variables in persisted_variables table.']
89+
include/assert.inc ['Expect 55 persisted variables shown as PERSISTED in variables_info table.']
8890
include/assert.inc ['Expect 45 persisted variables with matching persisted and global values.']
8991

9092
############################################################
@@ -136,6 +138,8 @@ RESET PERSIST IF EXISTS group_replication_recovery_ssl_crl;
136138
RESET PERSIST IF EXISTS group_replication_recovery_ssl_crlpath;
137139
RESET PERSIST IF EXISTS group_replication_recovery_ssl_key;
138140
RESET PERSIST IF EXISTS group_replication_recovery_ssl_verify_server_cert;
141+
RESET PERSIST IF EXISTS group_replication_recovery_tls_ciphersuites;
142+
RESET PERSIST IF EXISTS group_replication_recovery_tls_version;
139143
RESET PERSIST IF EXISTS group_replication_recovery_use_ssl;
140144
RESET PERSIST IF EXISTS group_replication_recovery_zstd_compression_level;
141145
RESET PERSIST IF EXISTS group_replication_single_primary_mode;

0 commit comments

Comments
 (0)