Skip to content

Commit 5dc8190

Browse files
author
Sven Sandberg
committed
WL#14194 step 2.11: Thread stages
WL#14194: Replace old terms in replication system variables, options, and strings. Replace all occurrences of master/slave/mts by source/replica/mta, in thread stages. RB:25355
1 parent 0eac4cb commit 5dc8190

File tree

89 files changed

+251
-250
lines changed

Some content is hidden

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

89 files changed

+251
-250
lines changed

mysql-test/extra/rpl_tests/check_slave_delay.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
--source include/rpl_connection_master.inc
3737
--source include/sync_slave_sql_with_master.inc
3838

39-
--let $assert_text= Status should not be 'Waiting until MASTER_DELAY seconds after master executed event'
40-
--let $assert_cond= NOT("[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until % seconds after master executed event")
39+
--let $assert_text= Status should not be 'Waiting until SOURCE_DELAY seconds after source executed event'
40+
--let $assert_cond= NOT("[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until % seconds after source executed event")
4141
--source include/assert.inc
4242

4343
--source include/rpl_connection_master.inc

mysql-test/extra/rpl_tests/check_slave_delay_multi_source.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
--let $sync_slave_connection= $slave
1818
--source include/sync_slave_sql_with_master.inc
1919

20-
--let $assert_text= Status should not be 'Waiting until MASTER_DELAY seconds after master executed event'
21-
--let $assert_cond= NOT("[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until % seconds after master executed event")
20+
--let $assert_text= Status should not be 'Waiting until SOURCE_DELAY seconds after source executed event'
21+
--let $assert_cond= NOT("[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until % seconds after source executed event")
2222
--source include/assert.inc
2323

2424
--let $rpl_connection_name= $master

mysql-test/extra/rpl_tests/check_slave_delay_old.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
--let $assert_cond= $time_diff >= $delay
4646
--source include/assert.inc
4747

48-
--let $assert_text= Status should not be 'Waiting until MASTER_DELAY seconds after master executed event'
49-
--let $assert_cond= NOT("[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until % seconds after master executed event")
48+
--let $assert_text= Status should not be 'Waiting until SOURCE_DELAY seconds after source executed event'
49+
--let $assert_cond= NOT("[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until % seconds after source executed event")
5050
--source include/assert.inc
5151

5252
--source include/rpl_connection_master.inc

mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ connection master;
3333
--let $assert_cond= MAX(b) < $query_number FROM t1
3434
--source include/assert.inc
3535

36-
--let $assert_text= Status should be 'Waiting until MASTER_DELAY...'
37-
--let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until MASTER_DELAY%"
36+
--let $assert_text= Status should be 'Waiting until SOURCE_DELAY...'
37+
--let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until SOURCE_DELAY%"
3838
--source include/assert.inc
3939

4040
--echo # sleep 1*T
@@ -48,7 +48,7 @@ connection master;
4848
--source include/assert.inc
4949

5050
--let $assert_text= Status should be 'Has read all relay log...'
51-
--let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Slave has read all relay log%"
51+
--let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Replica has read all relay log%"
5252
--source include/assert.inc
5353

5454

mysql-test/extra/rpl_tests/rpl_check_ps_applier_status_by_worker_gtid_skipped_transaction.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DROP TABLE t;
1717
--source include/sync_slave_sql_with_master.inc
1818

1919
--let $slave_param= Slave_SQL_Running_State
20-
--let $slave_param_value= Slave has read all relay log; waiting for more updates
20+
--let $slave_param_value= Replica has read all relay log; waiting for more updates
2121
--source include/wait_for_slave_param.inc
2222

2323
--let $last_processed_gtid_before= query_get_value(select LAST_PROCESSED_TRANSACTION from performance_schema.replication_applier_status_by_coordinator, LAST_PROCESSED_TRANSACTION, 1)

mysql-test/extra/rpl_tests/rpl_generate_mts_gap.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ INSERT INTO d1.t VALUES (2, 'T5');
4343
# Wait for coordinator to populate worker's queues.
4444
--let $show_statement= SHOW PROCESSLIST
4545
--let $field= State
46-
--let $condition= = 'Slave has read all relay log; waiting for more updates'
46+
--let $condition= = 'Replica has read all relay log; waiting for more updates'
4747
--source include/wait_show_condition.inc

mysql-test/extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ INSERT INTO d1.t VALUES (2, 'T5');
7373
# Wait for coordinator to populate worker's queues.
7474
--let $show_statement= SHOW PROCESSLIST
7575
--let $field= State
76-
--let $condition= = 'Slave has read all relay log; waiting for more updates'
76+
--let $condition= = 'Replica has read all relay log; waiting for more updates'
7777
--source include/wait_show_condition.inc
7878

7979
# Kill the slave server

mysql-test/extra/rpl_tests/rpl_gtid_drop_table.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ CREATE TEMPORARY TABLE temp_non_trans_t2 (c1 INT) ENGINE=MyISAM;
321321
# FormatDescription event which tells slave SQL thread to drop all temporary
322322
--let $show_statement= SHOW PROCESSLIST
323323
--let $field= State
324-
--let $condition= 'Slave has read all relay log; waiting for the slave I/O thread to update it';
324+
--let $condition= 'Replica has read all relay log; waiting for the slave I/O thread to update it';
325325
--source include/wait_show_condition.inc
326326

327327
# Now we verify replica_open_temp_tables, it should be '0'

mysql-test/extra/rpl_tests/rpl_mts_pending_events.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ if (!$tables_involved_in_test)
8888
--let $assert_cond= [SELECT count(*) FROM information_schema.processlist WHERE state = "Waiting for table metadata lock"] = 1
8989
--source include/assert.inc
9090

91-
--let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state = "Waiting for Slave Workers to free pending events"
91+
--let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state = "Waiting for Replica Workers to free pending events"
9292
--source include/wait_condition.inc
9393

9494
--echo #

mysql-test/extra/rpl_tests/rpl_mts_spco_check_worker_states.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ COMMIT;
132132

133133
--let $slave_timeout= 60
134134
--let $slave_param= Slave_SQL_Running_State
135-
--let $slave_param_value= Slave has read all relay log; waiting for more updates
135+
--let $slave_param_value= Replica has read all relay log; waiting for more updates
136136
--source include/wait_for_slave_param.inc
137137

138138
--source include/rpl_connection_master.inc

mysql-test/extra/rpl_tests/rpl_mts_until.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ if ($until_type == 'BEFORE_GTIDS')
7777

7878
eval START SLAVE SQL_THREAD UNTIL $__until_clause;
7979

80-
--let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state = "Waiting for workers to exit" OR state = "Waiting for Slave Worker to release partition"
80+
--let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state = "Waiting for workers to exit" OR state = "Waiting for Replica Worker to release partition"
8181
--source include/wait_condition.inc
8282

8383
--let $rpl_connection_name= server_2

mysql-test/extra/rpl_tests/rpl_multi_source_corrupt_repository.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ while ($i <= $number_of_channels)
321321
--let $slave_timeout= 60
322322

323323
--let $slave_param= Slave_IO_State
324-
--let $slave_param_value= Waiting for master to send event
324+
--let $slave_param_value= Waiting for source to send event
325325
--source include/wait_for_slave_param.inc
326326

327327
--let $slave_param= Slave_SQL_Running_State
328-
--let $slave_param_value= Slave has read all relay log; waiting for more updates
328+
--let $slave_param_value= Replica has read all relay log; waiting for more updates
329329
--source include/wait_for_slave_param.inc
330330

331331
--let $status_items=Last_IO_Errno,Last_IO_Error,Last_SQL_Errno,Last_SQL_Error,Channel_Name

mysql-test/extra/rpl_tests/rpl_multi_source_generate_mts_gap.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ BEGIN;
5151
# Wait for coordinator to populate worker's queues.
5252
--let $show_statement= SHOW PROCESSLIST
5353
--let $field= State
54-
--let $condition= = 'Slave has read all relay log; waiting for more updates'
54+
--let $condition= = 'Replica has read all relay log; waiting for more updates'
5555
--source include/wait_show_condition.inc

mysql-test/extra/rpl_tests/rpl_sync_relay_log_info_assert_pos.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if ($_rrli_expected != "N")
3131
if ($is_slave_sql_running == 'Yes' )
3232
{
3333
--let $slave_param= Slave_SQL_Running_State
34-
--let $slave_param_value= Slave has read all relay log; waiting for more updates
34+
--let $slave_param_value= Replica has read all relay log; waiting for more updates
3535
--source include/wait_for_slave_param.inc
3636
}
3737

mysql-test/extra/rpl_tests/rpl_trx_boundary_parser_one_step.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ BEGIN;
8282
--eval INSERT INTO $table VALUES (@val)
8383
COMMIT;
8484

85-
# Waiting for slave IO thread to stop
85+
# Waiting for replica IO thread to stop
8686
--source include/rpl_connection_slave.inc
8787
--source include/wait_for_slave_io_to_stop.inc
8888

mysql-test/include/rpl_reset.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
# Don't execute START REPLICA.
3838
#
3939
# $slave_timeout
40-
# Set the timeout when waiting for slave threads to stop and
40+
# Set the timeout when waiting for replica threads to stop and
4141
# start, respectively. See include/wait_for_slave_param.inc
4242
#
4343
# Note:

mysql-test/include/rpl_start_slaves.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# See include/rpl_init.inc
1919
#
2020
# $slave_timeout
21-
# Set the timeout when waiting for slave threads to stop and
21+
# Set the timeout when waiting for replica threads to stop and
2222
# start, respectively. See include/wait_for_slave_param.inc
2323

2424

mysql-test/include/rpl_stop_slaves.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# See include/stop_slave.inc
1717
#
1818
# $slave_timeout
19-
# Set the timeout when waiting for slave threads to stop. See
19+
# Set the timeout when waiting for replica threads to stop. See
2020
# include/wait_for_slave_param.inc
2121
#
2222
# $rpl_debug

mysql-test/include/wait_for_slave_param.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ while ($_slave_continue)
171171

172172
if ($_show_slave_status_error_value)
173173
{
174-
--echo **** ERROR: $slave_error_param = '$_show_slave_status_error_value' while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value ****
174+
--echo **** ERROR: $slave_error_param = '$_show_slave_status_error_value' while waiting for replica parameter $slave_param $_slave_param_comparison $slave_param_value ****
175175
--source include/show_rpl_debug_info.inc
176176
--die Error condition reached in include/wait_for_slave_param.inc
177177
}
@@ -188,7 +188,7 @@ while ($_slave_continue)
188188
{
189189
--let $end_to_wait=`select current_timestamp()`
190190

191-
--echo **** ERROR: timeout after $_slave_timeout ($end_to_wait - $start_to_wait) seconds while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value ****
191+
--echo **** ERROR: timeout after $_slave_timeout ($end_to_wait - $start_to_wait) seconds while waiting for replica parameter $slave_param $_slave_param_comparison $slave_param_value ****
192192
--source include/show_rpl_debug_info.inc
193193
--die Timeout in include/wait_for_slave_param.inc
194194
}

mysql-test/r/mysqlbinlog_raw_mode.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ UPDATE t1, t2 SET t1.a=10, t2.a=20;
288288
DROP TABLE t1,t2;
289289
flush logs;
290290
CREATE TABLE raw_mode_exit (exit_code INT);
291-
SELECT ((@id := id) - id) from information_schema.processlist where processlist.command like '%Binlog%' and state like '%Master has sent%';
291+
SELECT ((@id := id) - id) from information_schema.processlist where processlist.command like '%Binlog%' and state like '%Source has sent%';
292292
((@id := id) - id)
293293
0
294294
Warnings:

mysql-test/suite/binlog/t/binlog_mysqlbinlog_raw.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ while ($iteration>0)
6868
--exec /bin/bash $script
6969

7070
--echo # Step-3: Wait till dump thread transfer is completed.
71-
let $wait_condition= SELECT id from information_schema.processlist where processlist.command like '%Binlog%' and state like '%Master has sent%';
71+
let $wait_condition= SELECT id from information_schema.processlist where processlist.command like '%Binlog%' and state like '%Source has sent%';
7272
--source include/wait_condition.inc
7373

7474
--echo # Step-4: copy binary log file that is downloaded till now before

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
1818
START GROUP_REPLICATION;
1919

2020
[connection server1]
21-
"Verifying GR activity on M1 by checking if master has sent all binlog to slave"
21+
"Verifying GR activity on M1 by checking if master has sent all binlog to replica"
2222

2323
[connection server2]
2424
"Verifying GR activity on M2 by checking if slave has read all relay log"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ INSERT INTO t1 VALUES (1);
6161
--let $rpl_connection_name= server_2
6262
--source include/rpl_connection.inc
6363

64-
--let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.threads WHERE PROCESSLIST_STATE = 'Killing slave' AND PROCESSLIST_INFO = 'STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier"'
64+
--let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.threads WHERE PROCESSLIST_STATE = 'Killing replica' AND PROCESSLIST_INFO = 'STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier"'
6565
--source include/wait_condition.inc
6666

6767
--echo

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ while($i)
5757
# Verify GR activity on M1 using SHOW PROCESSLIST;
5858
--let $show_statement= SHOW PROCESSLIST;
5959
let $field= State;
60-
let $condition= = 'Master has sent all binlog to slave; waiting for more updates';
60+
let $condition= = 'Source has sent all binlog to replica; waiting for more updates';
6161
--source include/wait_show_condition.inc
6262
# Verify GR activity on M1 using select from INFORMATION_SCHEMA.PROCESSLIST
63-
--echo "Verifying GR activity on M1 by checking if master has sent all binlog to slave"
64-
--let $wait_condition= SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE='Master has sent all binlog to slave; waiting for more updates';
63+
--echo "Verifying GR activity on M1 by checking if master has sent all binlog to replica"
64+
--let $wait_condition= SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE='Source has sent all binlog to replica; waiting for more updates';
6565
--source include/wait_condition.inc
6666

6767
--echo
@@ -70,11 +70,11 @@ let $condition= = 'Master has sent all binlog to slave; waiting for more updates
7070
# Verify GR activity on M2 using SHOW PROCESSLIST;
7171
let $show_statement= SHOW PROCESSLIST;
7272
let $field= State;
73-
let $condition= = 'Slave has read all relay log; waiting for more updates';
73+
let $condition= = 'Replica has read all relay log; waiting for more updates';
7474
--source include/wait_show_condition.inc
7575
# Verify GR activity on M2 using select from INFORMATION_SCHEMA.PROCESSLIST
7676
--echo "Verifying GR activity on M2 by checking if slave has read all relay log"
77-
--let $wait_condition= SELECT COUNT(*)>=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State='Slave has read all relay log; waiting for more updates';
77+
--let $wait_condition= SELECT COUNT(*)>=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State='Replica has read all relay log; waiting for more updates';
7878
--source include/wait_condition.inc
7979

8080
# Restart slave sql_thread for group replication applier channel

mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch_rep_status.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ select
116116
#let $cluster_b_master_log_pos = query_get_value("SELECT Position from mysql.ndb_binlog_index WHERE epoch >= $max_applied_cluster_b_epoch", Position, 1);
117117
#--echo Now change new Slave servers to new Master file + pos
118118
#--connection master
119-
#--echo Changing master to $cluster_b_master_log_file, $cluster_b_master_log_pos
119+
#--echo Changing replication source to $cluster_b_master_log_file, $cluster_b_master_log_pos
120120
#eval CHANGE MASTER TO MASTER_LOG_FILE="$cluster_b_master_log_file", MASTER_LOG_POS=$cluster_b_master_log_pos;
121121
#--connection slave1
122-
#--echo Changing master to $cluster_a_master_log_file, $cluster_a_master_log_pos
122+
#--echo Changing replication source to $cluster_a_master_log_file, $cluster_a_master_log_pos
123123
#eval CHANGE MASTER TO MASTER_LOG_FILE="$cluster_a_master_log_file", MASTER_LOG_POS=$cluster_a_master_log_pos;
124124

125125
--echo Get current master status on Cluster A new master (next pos in Binlog)

mysql-test/suite/perfschema/r/rpl_threads.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ select COMMAND, STATE
1919
from INFORMATION_SCHEMA.PROCESSLIST
2020
where ID = @master_dump_pid;
2121
COMMAND STATE
22-
Binlog Dump Master has sent all binlog to slave; waiting for more updates
22+
Binlog Dump Source has sent all binlog to replica; waiting for more updates
2323
select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
2424
from performance_schema.threads
2525
where PROCESSLIST_ID = @master_dump_pid;
2626
NAME TYPE PROCESSLIST_COMMAND PROCESSLIST_STATE
27-
thread/sql/one_connection FOREGROUND Binlog Dump Master has sent all binlog to slave; waiting for more updates
27+
thread/sql/one_connection FOREGROUND Binlog Dump Source has sent all binlog to replica; waiting for more updates
2828
select THREAD_ID from performance_schema.threads
2929
where PROCESSLIST_ID = @master_dump_pid
3030
into @master_dump_tid;
@@ -41,18 +41,18 @@ VARIABLE_NAME VARIABLE_VALUE
4141
Compression_level 0
4242
"============ Performance schema on slave ============"
4343
select ID from INFORMATION_SCHEMA.PROCESSLIST
44-
where STATE like "Waiting for master to send event%"
44+
where STATE like "Waiting for source to send event%"
4545
into @slave_io_pid;
4646
select COMMAND, STATE
4747
from INFORMATION_SCHEMA.PROCESSLIST
4848
where ID = @slave_io_pid;
4949
COMMAND STATE
50-
Connect Waiting for master to send event
50+
Connect Waiting for source to send event
5151
select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
5252
from performance_schema.threads
5353
where PROCESSLIST_ID = @slave_io_pid;
5454
NAME TYPE PROCESSLIST_COMMAND PROCESSLIST_STATE
55-
thread/sql/slave_io FOREGROUND Connect Waiting for master to send event
55+
thread/sql/slave_io FOREGROUND Connect Waiting for source to send event
5656
select THREAD_ID from performance_schema.threads
5757
where PROCESSLIST_ID = @slave_io_pid
5858
into @slave_io_tid;
@@ -68,18 +68,18 @@ where VARIABLE_NAME = 'Compression_level' and THREAD_ID = @slave_io_tid;
6868
VARIABLE_NAME VARIABLE_VALUE
6969
Compression_level 0
7070
select ID from INFORMATION_SCHEMA.PROCESSLIST
71-
where STATE like "Slave has read all relay log%"
71+
where STATE like "Replica has read all relay log%"
7272
into @slave_sql_pid;
7373
select COMMAND, STATE
7474
from INFORMATION_SCHEMA.PROCESSLIST
7575
where ID = @slave_sql_pid;
7676
COMMAND STATE
77-
Query Slave has read all relay log; waiting for more updates
77+
Query Replica has read all relay log; waiting for more updates
7878
select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
7979
from performance_schema.threads
8080
where PROCESSLIST_ID = @slave_sql_pid;
8181
NAME TYPE PROCESSLIST_COMMAND PROCESSLIST_STATE
82-
thread/sql/slave_sql FOREGROUND Query Slave has read all relay log; waiting for more updates
82+
thread/sql/slave_sql FOREGROUND Query Replica has read all relay log; waiting for more updates
8383
select THREAD_ID from performance_schema.threads
8484
where PROCESSLIST_ID = @slave_sql_pid
8585
into @slave_sql_tid;

mysql-test/suite/perfschema/t/rpl_threads.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ sync_slave_with_master;
6161
# Read the ID of the SLAVE IO thread,
6262
# as exposed in PROCESSLIST.
6363
select ID from INFORMATION_SCHEMA.PROCESSLIST
64-
where STATE like "Waiting for master to send event%"
64+
where STATE like "Waiting for source to send event%"
6565
into @slave_io_pid;
6666

6767
select COMMAND, STATE
@@ -91,7 +91,7 @@ select VARIABLE_NAME, VARIABLE_VALUE
9191
# Read the ID of the SLAVE SQL thread,
9292
# as exposed in PROCESSLIST.
9393
select ID from INFORMATION_SCHEMA.PROCESSLIST
94-
where STATE like "Slave has read all relay log%"
94+
where STATE like "Replica has read all relay log%"
9595
into @slave_sql_pid;
9696

9797
select COMMAND, STATE

mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Note #### Storing MySQL user name or password information in the master info rep
55
[connection master]
66
create view coord_wait_list as
77
SELECT id from Information_Schema.processlist
8-
where state like 'Waiting for Slave Worker%';
8+
where state like 'Waiting for Replica Worker%';
99
include/stop_slave.inc
1010
set @save.replica_parallel_workers= @@global.replica_parallel_workers;
1111
set @@global.replica_parallel_workers= 4;

0 commit comments

Comments
 (0)