Merge branch 'mysql-8.0' into mysql-trunk

Author: Anibal Pinto

mysql-test/suite/group_replication/r/gr_force_members_non_persistable_variable.result

@@ -0,0 +1,18 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+####################################################################
+# 1. SET PERSIST group_replication_force_members shall fail,
+#    variable non persistable
+SET PERSIST group_replication_force_members = "";
+ERROR HY000: Variable 'group_replication_force_members' is a non persistent variable
+
+####################################################################
+# 2. SET PERSIST_ONLY group_replication_force_members shall fail,
+#    variable non persistable
+SET PERSIST_ONLY group_replication_force_members = "";
+ERROR HY000: Variable 'group_replication_force_members' is a non persistent variable
+include/group_replication_end.inc

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

@@ -18,6 +18,7 @@ CREATE TABLE grvars (id INT PRIMARY KEY AUTO_INCREMENT, varname VARCHAR(64), var
 INSERT INTO grvars (varname, varvalue)
 SELECT * FROM performance_schema.global_variables
 WHERE VARIABLE_NAME LIKE 'group_replication%'
+ AND VARIABLE_NAME NOT LIKE 'group_replication_force_members'
  ORDER BY VARIABLE_NAME;
 
 SET PERSIST_ONLY group_replication_advertise_recovery_endpoints = @@GLOBAL.group_replication_advertise_recovery_endpoints;
@@ -43,7 +44,6 @@ SET PERSIST_ONLY group_replication_flow_control_min_recovery_quota = @@GLOBAL.gr
 SET PERSIST_ONLY group_replication_flow_control_mode = @@GLOBAL.group_replication_flow_control_mode;
 SET PERSIST_ONLY group_replication_flow_control_period = @@GLOBAL.group_replication_flow_control_period;
 SET PERSIST_ONLY group_replication_flow_control_release_percent = @@GLOBAL.group_replication_flow_control_release_percent;
-SET PERSIST_ONLY group_replication_force_members = @@GLOBAL.group_replication_force_members;
 SET PERSIST_ONLY group_replication_group_name = @@GLOBAL.group_replication_group_name;
 SET PERSIST_ONLY group_replication_group_seeds = @@GLOBAL.group_replication_group_seeds;
 SET PERSIST_ONLY group_replication_gtid_assignment_block_size = @@GLOBAL.group_replication_gtid_assignment_block_size;
@@ -79,7 +79,7 @@ SET PERSIST_ONLY group_replication_tls_source = @@GLOBAL.group_replication_tls_s
 SET PERSIST_ONLY group_replication_transaction_size_limit = @@GLOBAL.group_replication_transaction_size_limit;
 SET PERSIST_ONLY group_replication_unreachable_majority_timeout = @@GLOBAL.group_replication_unreachable_majority_timeout;
 
-include/assert.inc ['Expect 58 persisted variables.']
+include/assert.inc ['Expect 57 persisted variables.']
 
 ############################################################
 # 2. Restart server, it must bootstrap the group and preserve
@@ -88,9 +88,9 @@ include/assert.inc ['Expect 58 persisted variables.']
 include/rpl_reconnect.inc
 include/gr_wait_for_member_state.inc
 
-include/assert.inc ['Expect 58 persisted variables in persisted_variables table.']
-include/assert.inc ['Expect 57 variables which last value was set through SET PERSIST.']
-include/assert.inc ['Expect 49 persisted variables with matching persisted and global values.']
+include/assert.inc ['Expect 57 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 56 variables which last value was set through SET PERSIST.']
+include/assert.inc ['Expect 48 persisted variables with matching persisted and global values.']
 
 ############################################################
 # 3. Test RESET PERSIST IF EXISTS.
@@ -118,7 +118,6 @@ RESET PERSIST IF EXISTS group_replication_flow_control_min_recovery_quota;
 RESET PERSIST IF EXISTS group_replication_flow_control_mode;
 RESET PERSIST IF EXISTS group_replication_flow_control_period;
 RESET PERSIST IF EXISTS group_replication_flow_control_release_percent;
-RESET PERSIST IF EXISTS group_replication_force_members;
 RESET PERSIST IF EXISTS group_replication_group_name;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_gtid_assignment_block_size;

mysql-test/suite/group_replication/r/gr_persist_variables.result

@@ -18,6 +18,7 @@ CREATE TABLE grvars (id INT PRIMARY KEY AUTO_INCREMENT, varname VARCHAR(64), var
 INSERT INTO grvars (varname, varvalue)
 SELECT * FROM performance_schema.global_variables
 WHERE VARIABLE_NAME LIKE '%group_replication%'
+ AND VARIABLE_NAME NOT LIKE 'group_replication_force_members'
  ORDER BY VARIABLE_NAME;
 
 SET PERSIST group_replication_advertise_recovery_endpoints = @@GLOBAL.group_replication_advertise_recovery_endpoints;
@@ -43,7 +44,6 @@ SET PERSIST group_replication_flow_control_min_recovery_quota = @@GLOBAL.group_r
 SET PERSIST group_replication_flow_control_mode = @@GLOBAL.group_replication_flow_control_mode;
 SET PERSIST group_replication_flow_control_period = @@GLOBAL.group_replication_flow_control_period;
 SET PERSIST group_replication_flow_control_release_percent = @@GLOBAL.group_replication_flow_control_release_percent;
-SET PERSIST group_replication_force_members = @@GLOBAL.group_replication_force_members;
 SET PERSIST group_replication_group_name = @@GLOBAL.group_replication_group_name;
 SET PERSIST group_replication_group_seeds = @@GLOBAL.group_replication_group_seeds;
 SET PERSIST group_replication_gtid_assignment_block_size = @@GLOBAL.group_replication_gtid_assignment_block_size;
@@ -81,7 +81,7 @@ SET PERSIST group_replication_tls_source = @@GLOBAL.group_replication_tls_source
 SET PERSIST group_replication_transaction_size_limit = @@GLOBAL.group_replication_transaction_size_limit;
 SET PERSIST group_replication_unreachable_majority_timeout = @@GLOBAL.group_replication_unreachable_majority_timeout;
 
-include/assert.inc ['Expect 58 persisted variables.']
+include/assert.inc ['Expect 57 persisted variables.']
 
 ############################################################
 # 2. Restart server, it must bootstrap the group and preserve
@@ -90,9 +90,9 @@ include/assert.inc ['Expect 58 persisted variables.']
 include/rpl_reconnect.inc
 include/gr_wait_for_member_state.inc
 
-include/assert.inc ['Expect 58 persisted variables in persisted_variables table.']
-include/assert.inc ['Expect 57 variables which last value was set through SET PERSIST.']
-include/assert.inc ['Expect 57 variables which last value was set through SET PERSIST is equal to its global value.']
+include/assert.inc ['Expect 57 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 56 variables which last value was set through SET PERSIST.']
+include/assert.inc ['Expect 56 variables which last value was set through SET PERSIST is equal to its global value.']
 
 ############################################################
 # 3. Test RESET PERSIST.
@@ -120,7 +120,6 @@ RESET PERSIST group_replication_flow_control_min_recovery_quota;
 RESET PERSIST group_replication_flow_control_mode;
 RESET PERSIST group_replication_flow_control_period;
 RESET PERSIST group_replication_flow_control_release_percent;
-RESET PERSIST group_replication_force_members;
 RESET PERSIST group_replication_group_name;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_gtid_assignment_block_size;

mysql-test/suite/group_replication/t/gr_force_members_non_persistable_variable.test

@@ -0,0 +1,35 @@
+################################################################################
+#
+# This test checks isn't possible to SET PERSIST on
+# group_replication_force_members variable.
+#
+# Test:
+#  0. This test require one server
+#  1. SET PERSIST group_replication_force_members shall fail,
+#     variable non persistable
+#  2. SET PERSIST_ONLY group_replication_force_members shall fail,
+#     variable non persistable
+#
+################################################################################
+
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+--echo
+--echo ####################################################################
+--echo # 1. SET PERSIST group_replication_force_members shall fail,
+--echo #    variable non persistable
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET PERSIST group_replication_force_members = "";
+
+--echo
+--echo ####################################################################
+--echo # 2. SET PERSIST_ONLY group_replication_force_members shall fail,
+--echo #    variable non persistable
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET PERSIST_ONLY group_replication_force_members = "";
+
+--source include/group_replication_end.inc

mysql-test/suite/group_replication/t/gr_persist_only_variables.test

@@ -38,6 +38,7 @@ CREATE TABLE grvars (id INT PRIMARY KEY AUTO_INCREMENT, varname VARCHAR(64), var
 INSERT INTO grvars (varname, varvalue)
  SELECT * FROM performance_schema.global_variables
  WHERE VARIABLE_NAME LIKE 'group_replication%'
+ AND VARIABLE_NAME NOT LIKE 'group_replication_force_members'
  ORDER BY VARIABLE_NAME;
 
 --let $countvars= `SELECT COUNT(*) FROM grvars;`
@@ -89,7 +90,7 @@ while ( $varid <= $countvars )
 --source include/assert.inc
 
 #  TODO: Update this once Bug#27322592 is FIXED.
---let $persisted_variables = 49
+--let $persisted_variables = 48
 --let $assert_text= 'Expect $persisted_variables persisted variables with matching persisted and global values.'
 --let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info vi JOIN performance_schema.persisted_variables pv JOIN performance_schema.global_variables gv ON vi.variable_name=pv.variable_name AND vi.variable_name=gv.variable_name AND pv.variable_value=gv.variable_value WHERE vi.variable_source="PERSISTED", count, 1] = $persisted_variables
 --source include/assert.inc

mysql-test/suite/group_replication/t/gr_persist_variables.test

@@ -38,6 +38,7 @@ CREATE TABLE grvars (id INT PRIMARY KEY AUTO_INCREMENT, varname VARCHAR(64), var
 INSERT INTO grvars (varname, varvalue)
  SELECT * FROM performance_schema.global_variables
  WHERE VARIABLE_NAME LIKE '%group_replication%'
+ AND VARIABLE_NAME NOT LIKE 'group_replication_force_members'
  ORDER BY VARIABLE_NAME;
 
 --let $countvars= `SELECT COUNT(*) FROM grvars;`

plugin/group_replication/src/plugin.cc

@@ -3958,7 +3958,7 @@ static MYSQL_SYSVAR_STR(
     force_members,        /* name */
     ov.force_members_var, /* var */
     PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC |
-        PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var | malloc string*/
+        PLUGIN_VAR_NOPERSIST, /* optional var | malloc string*/
     "The list of members, comma separated. E.g., host1:port1,host2:port2. "
     "This option is used to force a new group membership, on which the "
     "excluded "