WL#14194 step 2.1: System variables

WL#14194: Replace old terms in replication system variables, options,
and strings.

Replace all occurrences of master/slave/mts by source/replica/mta, in
system variables.

RB:25355

Author: Sven Sandberg

include/my_getopt.h

@@ -138,8 +138,8 @@ typedef void *(*my_getopt_value)(const char *, size_t, const struct my_option *,
 extern char *disabled_my_option;
 extern bool my_getopt_print_errors;
 extern bool my_getopt_skip_unknown;
-extern bool log_slave_updates_supplied;
-extern bool slave_preserve_commit_order_supplied;
+extern bool log_replica_updates_supplied;
+extern bool replica_preserve_commit_order_supplied;
 extern my_error_reporter my_getopt_error_reporter;
 
 extern "C" int handle_options(int *argc, char ***argv,

include/mysql/group_replication_priv.h

@@ -200,16 +200,16 @@ const char *get_write_set_algorithm_string(unsigned int algorithm);
 bool is_gtid_committed(const Gtid &gtid);
 
 /**
-  Returns the value of slave_max_allowed_packet.
+  Returns the value of replica_max_allowed_packet.
 
-  @return slave_max_allowed_packet
+  @return replica_max_allowed_packet
 */
-unsigned long get_slave_max_allowed_packet();
+unsigned long get_replica_max_allowed_packet();
 
 /**
-  @returns the maximum value of slave_max_allowed_packet.
+  @returns the maximum value of replica_max_allowed_packet.
  */
-unsigned long get_max_slave_max_allowed_packet();
+unsigned long get_max_replica_max_allowed_packet();
 
 /**
   @returns if the server is restarting after a clone

mysql-test/collections/default.daily

@@ -70,10 +70,10 @@ perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication
 # MTR or mysqld options in this section
 
 # Additional modes for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --timer  --force  --comment=rpl_MTS_db_part --vardir=var-mts-rpl_db --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=database --do-suite=rpl --no-skip --exclude-platform=windows
-perl mysql-test-run.pl --timer  --force  --parallel=8 --comment=rpl_MTS_db_part --vardir=var-mts-rpl_db --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=database --do-suite=rpl --no-skip --platform=windows
-perl mysql-test-run.pl --timer  --force  --comment=rpl_MTS_LC --vardir=var-rpl_mts_LC --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --do-suite=rpl --no-skip --exclude-platform=windows
-perl mysql-test-run.pl --timer  --parallel=8 --force  --comment=rpl_MTS_LC --vardir=var-rpl_mts_LC --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --do-suite=rpl --no-skip --platform=windows
+perl mysql-test-run.pl --timer  --force  --comment=rpl_MTS_db_part --vardir=var-mts-rpl_db --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --do-suite=rpl --no-skip --exclude-platform=windows
+perl mysql-test-run.pl --timer  --force  --parallel=8 --comment=rpl_MTS_db_part --vardir=var-mts-rpl_db --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --do-suite=rpl --no-skip --platform=windows
+perl mysql-test-run.pl --timer  --force  --comment=rpl_MTS_LC --vardir=var-rpl_mts_LC --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --do-suite=rpl --no-skip --exclude-platform=windows
+perl mysql-test-run.pl --timer  --parallel=8 --force  --comment=rpl_MTS_LC --vardir=var-rpl_mts_LC --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --do-suite=rpl --no-skip --platform=windows
 
 # Additional GTID coverage (rpl suite with gtid_mode=ON)
 perl mysql-test-run.pl --force --timer   --comment=rpl_with_gtid --vardir=var-rpl_gtid --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--gtid-mode=on --no-skip --exclude-platform=windows

mysql-test/collections/default.weekly

@@ -68,8 +68,8 @@ perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=gro
 # MTR or mysqld options in this section
 
 # Additional mode for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mts-db --vardir=var-rpl-mts-db  --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=database --do-suite=rpl --no-skip
-perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mts-lc --vardir=var-rpl-mts-lc  --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --do-suite=rpl --no-skip
+perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mts-db --vardir=var-rpl-mts-db  --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --do-suite=rpl --no-skip
+perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mts-lc --vardir=var-rpl-mts-lc  --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --do-suite=rpl --no-skip
 
 # Additional GTID coverage (rpl suite with gtid_mode=ON)
 perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=60   --comment=rpl-gtid --vardir=var-rpl-gtid --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--gtid-mode=on --no-skip
@@ -100,8 +100,8 @@ perl mysql-test-run.pl --debug-server --timer --force  --comment=innodb-page-siz
 ## Running default suites other than rpl and binlog with binlog-format mixed
 perl mysql-test-run.pl --comment=all-binlogformat-mix --vardir=var-binlogformat-mix --force --timer --debug-server  --suite=auth_sec,clone,collations,connection_control,encryption,federated,funcs_1,funcs_2,gcol,sysschema,gis,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,test_service_sql_api,test_services,x --mysqld=--binlog_format=mixed
 
-## Running default suites other than rpl and binlog with skip-log-bin and skip-log-slave-updates
-perl mysql-test-run.pl --comment=all-skiplogbin --vardir=var-skiplogbin --force --timer --debug-server  --suite=auth_sec,clone,collations,connection_control,encryption,federated,funcs_1,funcs_2,gcol,sysschema,gis,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,test_service_sql_api,test_services,x --mysqld=--skip-log-bin --mysqld=--skip-log-slave-updates
+## Running default suites other than rpl and binlog with skip-log-bin and skip-log-replica-updates
+perl mysql-test-run.pl --comment=all-skiplogbin --vardir=var-skiplogbin --force --timer --debug-server  --suite=auth_sec,clone,collations,connection_control,encryption,federated,funcs_1,funcs_2,gcol,sysschema,gis,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,test_service_sql_api,test_services,x --mysqld=--skip-log-bin --mysqld=--skip-log-replica-updates
 ######END OF SECTION (DEFAULT SUITES (EXTENDED-WEEKLY))######################
 
 
@@ -156,10 +156,10 @@ perl mysql-test-run.pl --timer  --force  --comment=innodb_sync_debug --testcase-
 #
 perl mysql-test-run.pl --force --debug-server --timer   --comment=rpl_row_table_scan --vardir=var-rpl_row_table_scan --mysqld=--binlog-format=row --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --big-test --testcase-timeout=60  --no-skip
 
-perl mysql-test-run.pl --debug-server --timer --force  --comment=rpl_row_table_MTS --vardir=var-mts-rpl-table-n_mix --mysqld=--binlog-format=row  --mysqld=--slave-parallel-workers=4 --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --no-skip
+perl mysql-test-run.pl --debug-server --timer --force  --comment=rpl_row_table_MTS --vardir=var-mts-rpl-table-n_mix --mysqld=--binlog-format=row  --mysqld=--replica-parallel-workers=4 --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --no-skip
 
 # binlog-transaction-dependency-tracking=WRITESET with MTS slave-parellel-type=logical-clock
-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server  --comment=rpl_MTS-lc-binlog-txn-dependency-tracking --vardir=var-rpl-MTS-lc-binlog-txn-dependency-tracking --do-suite=rpl   --mysqld=--binlog-format=row --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock  --no-skip --mysqld=--binlog-transaction-dependency-tracking=WRITESET
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server  --comment=rpl_MTS-lc-binlog-txn-dependency-tracking --vardir=var-rpl-MTS-lc-binlog-txn-dependency-tracking --do-suite=rpl   --mysqld=--binlog-format=row --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock  --no-skip --mysqld=--binlog-transaction-dependency-tracking=WRITESET
 
 # Rpl suite with Transaction-writeset-extraction disabled
 perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=60   --comment=rpl_without_txn_write_set_extraction --vardir=var-rpl_txn_write_set_extraction_disabled --suite=rpl,rpl_gtid,rpl_nogtid  --mysqld=--transaction-write-set-extraction=OFF --no-skip
@@ -169,7 +169,7 @@ perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-time
 perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=60   --comment=rpl_master_info_file --vardir=var-rpl_master_info_file --do-suite=rpl --mysqld=--master-info-repository=FILE  --no-skip
 
 # RPL suite + MTS + WRITESET + LOGICAL_CLOCK with binlog compression turned ON.
-perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60 --comment=replication_compression_mts_lc_ws --vardir=var-rpl-comp-mts-lc-ws --mysqld=--slave_parallel_type=LOGICAL_CLOCK --mysqld=--slave_parallel_workers=4 --mysqld=--binlog-format=ROW --mysqld=--binlog-transaction-dependency-tracking=WRITESET --mysqld=--binlog-transaction-compression=ON --do-suite=rpl --no-skip
+perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60 --comment=replication_compression_mts_lc_ws --vardir=var-rpl-comp-mts-lc-ws --mysqld=--replica_parallel_type=LOGICAL_CLOCK --mysqld=--replica_parallel_workers=4 --mysqld=--binlog-format=ROW --mysqld=--binlog-transaction-dependency-tracking=WRITESET --mysqld=--binlog-transaction-compression=ON --do-suite=rpl --no-skip
 
 # binlog suite with compression turned on
 perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60 --comment=binlog_compression --vardir=var-binlog-comp --mysqld=--binlog-transaction-compression=ON --suite=binlog,binlog_nogtid,binlog_gtid,i_binlog --mysqld=--binlog-format=ROW --no-skip
@@ -186,8 +186,8 @@ perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-time
 perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1 --vardir=var-gr_gtid_assignment_block_size_1 --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_gtid_assignment_block_size=1
 
 #GR with MTS
-perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier --vardir=var-gr_parallel_applier --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --mysqld=--slave_preserve_commit_order=ON
-perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier_binlog-txn-dependency-tracking --vardir=var-gr_parallel_applier_binlog-txn-dependency-tracking --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --mysqld=--slave_preserve_commit_order=ON --mysqld=--binlog-transaction-dependency-tracking=WRITESET
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier --vardir=var-gr_parallel_applier --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --mysqld=--replica_preserve_commit_order=ON
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier_binlog-txn-dependency-tracking --vardir=var-gr_parallel_applier_binlog-txn-dependency-tracking --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --mysqld=--replica_preserve_commit_order=ON --mysqld=--binlog-transaction-dependency-tracking=WRITESET
 
 #GR with group_replication_ssl_mode = REQUIRED
 perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_ssl_mode_required --vardir=var-gr_ssl_mode_required --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED
@@ -199,7 +199,7 @@ perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1-debug --vardir=var-gr_gtid_assignment_block_size_1-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_gtid_assignment_block_size=1
 
 #GR with MTS on debug build
-perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_parallel_applier-debug --vardir=var-gr_parallel_applier-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --mysqld=--slave_preserve_commit_order=ON
+perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_parallel_applier-debug --vardir=var-gr_parallel_applier-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --mysqld=--replica_preserve_commit_order=ON
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_ssl_mode_required-debug --vardir=var-gr_ssl_mode_required-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED
 
 #GR with group_replication_ssl_mode = REQUIRED on debug build

mysql-test/collections/mysql-8.0-stage.push

@@ -21,7 +21,7 @@ perl mysql-test-run.pl --timer  --force  --comment=innodb_4k --vardir=var-innodb
 perl mysql-test-run.pl --timer  --force  --comment=innodb_64k --vardir=var-innodb-64k  --suite=innodb_undo,innodb_zip,innodb --initialize=--innodb-page-size=64k --no-skip --max-test-fail=30
 
 # Additional modes for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--slave-parallel-workers=4 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
+perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--replica-parallel-workers=4 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
 
 # Run the suites that are not part of the default - funcs_1, funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer --testcase-timeout=60     --comment=funcs1  --vardir=var-funcs1 --suite=funcs_1 --no-skip --max-test-fail=30

mysql-test/collections/mysql-trunk-stage.push

@@ -21,7 +21,7 @@ perl mysql-test-run.pl --timer  --force  --comment=innodb_4k --vardir=var-innodb
 perl mysql-test-run.pl --timer  --force  --comment=innodb_64k --vardir=var-innodb-64k  --suite=innodb_undo,innodb_zip,innodb --initialize=--innodb-page-size=64k --no-skip --max-test-fail=30
 
 # Additional modes for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--slave-parallel-workers=4 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
+perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--replica-parallel-workers=4 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
 
 # Run the suites that are not part of the default - funcs_1, funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer --testcase-timeout=60     --comment=funcs1  --vardir=var-funcs1 --suite=funcs_1 --no-skip --max-test-fail=30

mysql-test/extra/binlog_tests/binlog_xa_prepared.test

@@ -164,7 +164,7 @@ XA START 'xa1';
 INSERT INTO t SET a = 1;
 XA END 'xa1';
 --error ER_VARIABLE_NOT_SETTABLE_IN_TRANSACTION
-SET @@SESSION.pseudo_slave_mode=1;
+SET @@SESSION.pseudo_replica_mode=1;
 XA PREPARE 'xa1';
 
 --connection default
@@ -179,7 +179,7 @@ INSERT INTO t SET a = 1;
 XA END 'xa1';
 XA PREPARE 'xa1';
 --error ER_VARIABLE_NOT_SETTABLE_IN_TRANSACTION
-SET @@SESSION.pseudo_slave_mode=1;
+SET @@SESSION.pseudo_replica_mode=1;
 XA COMMIT 'xa1';
 
 DROP TABLE t;

mysql-test/extra/rpl_tests/check_type.inc

@@ -23,7 +23,7 @@ if (!$engine_type)
 if ($rpl_debug)
 {
   --echo source_type=$source_type target_type=$target_type source_value=$source_value target_value=$target_value can_convert=$can_convert engine_type=$engine_type
-  SELECT @@GLOBAL.SLAVE_TYPE_CONVERSIONS;
+  SELECT @@GLOBAL.REPLICA_TYPE_CONVERSIONS;
 }
 
 --source include/rpl_connection_master.inc
@@ -45,7 +45,7 @@ if ($can_convert) {
   eval INSERT INTO type_conversions SET
        Source = "$source_type",
        Target = "$target_type",
-       Flags = @@slave_type_conversions,
+       Flags = @@replica_type_conversions,
        On_Master = $source_value,
        Expected = $target_value,
        Compare = @compare;
@@ -60,9 +60,9 @@ if (!$can_convert) {
   eval INSERT INTO type_conversions SET
        Source = "$source_type",
        Target = "$target_type",
-       Flags = @@slave_type_conversions,
+       Flags = @@replica_type_conversions,
        On_Master = $source_value,
        Error = "$error";
-  SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
+  SET GLOBAL SQL_REPLICA_SKIP_COUNTER = 1;
   START SLAVE;
 }

mysql-test/extra/rpl_tests/mts_spco_generate_deadlock.inc

@@ -191,17 +191,17 @@ if ($mts_spco_gd_trx_assigned_worker_3 != '')
 --let $client = `SELECT CONNECTION_ID()`
 
 --let $assert_text = Replica parallel type is LOGICAL_CLOCK
---let $assert_cond = "[SELECT @@GLOBAL.slave_parallel_type]" = "LOGICAL_CLOCK"
+--let $assert_cond = "[SELECT @@GLOBAL.replica_parallel_type]" = "LOGICAL_CLOCK"
 --source include/assert.inc
 --let $worker_count = `SELECT COUNT(*) FROM performance_schema.threads WHERE name LIKE "thread/sql/slave_worker"`
 --let $assert_text = MTS worker thread count is correct
 --let $assert_cond = "3" = "$worker_count"
 --source include/assert.inc
 --let $assert_text = Replica preserve commit order is 1
---let $assert_cond = "[SELECT @@GLOBAL.slave_preserve_commit_order]" = "1"
+--let $assert_cond = "[SELECT @@GLOBAL.replica_preserve_commit_order]" = "1"
 --source include/assert.inc
 --let $assert_text = Replica transaction retries has correct configured value
---let $assert_cond = "[SELECT @@GLOBAL.slave_transaction_retries]" = "$mts_spco_gd_transaction_retries"
+--let $assert_cond = "[SELECT @@GLOBAL.replica_transaction_retries]" = "$mts_spco_gd_transaction_retries"
 --source include/assert.inc
 --let $assert_text = InnoDB lock wait timeout has correct configured value
 --let $assert_cond = "[SELECT @@GLOBAL.innodb_lock_wait_timeout]" = "$mts_spco_gd_innodb_wait_timeout"