Manually merged from 5.7.

Author: Jaideep Karande

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

@@ -36,8 +36,8 @@ include/assert.inc [The value of auto_increment_offset is set to 2]
 #    the auto_increment_increment value, an error is logged.
 ############################################################
 Matching lines are:
-DATE_TIME [ERROR] [Repl] Plugin group_replication reported: 'Group contains 4 members which is greater than group_replication_auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.'
-Occurrences of 'Group contains 4 members which is greater than group_replication_auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.' in the input file: 1
+DATE_TIME [ERROR] [Repl] Plugin group_replication reported: 'Group contains 4 members which is greater than auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.'
+Occurrences of 'Group contains 4 members which is greater than auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.' in the input file: 1
 ############################################################
 # 5. When auto_increment_increment and auto_increment_offset
 #    not set to default value

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

@@ -18,11 +18,11 @@ Note	####	Storing MySQL user name or password information in the master info rep
 #
 [connection server1]
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 [connection server2]
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 
 # Create a table on all members.

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

@@ -111,7 +111,7 @@ SET GLOBAL GROUP_REPLICATION_AUTO_INCREMENT_INCREMENT= 3;
 
 --replace_regex /[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][-+Z][0-9:]* *[0-9]* \[ERROR\] \[[^\]]*\] */DATE_TIME [ERROR] /
 --let $grep_file=$MYSQLTEST_VARDIR/tmp/group_replication_auto_increment_increment_log.err
---let $grep_pattern=Group contains 4 members which is greater than group_replication_auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.
+--let $grep_pattern=Group contains 4 members which is greater than auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.
 --source include/grep_pattern.inc
 
 --echo ############################################################

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

@@ -40,13 +40,13 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 
 --echo

share/errmsg-utf8.txt

@@ -13475,7 +13475,7 @@ ER_GRP_RPL_SUPER_READ_ONLY_ACTIVATE_ERROR
   eng "Error when activating super_read_only mode on start. The member will now exit the group."
 
 ER_GRP_RPL_EXCEEDS_AUTO_INC_VALUE
-  eng "Group contains %lu members which is greater than group_replication_auto_increment_increment value of %lu. This can lead to an higher rate of transactional aborts."
+  eng "Group contains %lu members which is greater than auto_increment_increment value of %lu. This can lead to an higher rate of transactional aborts."
 
 ER_GRP_RPL_DATA_NOT_PROVIDED_BY_MEM
   eng "Member with address '%s:%u' didn't provide any data during the last group change. Group information can be outdated and lead to errors on recovery."