WL#14191: Step 1: Changes obtained through the script

WL#14191:Replace old terms in replication error messages

This patch was created by running the scripts written for
replacing the old terminologies with new ones.
The changes are done in server defined Error names and Error messages
also in the hard coded messages defined in source files.

RB: 27817,27755,27734,27863,27945

Author: Neha Kumari

client/mysqltest.cc

@@ -4971,11 +4971,12 @@ static void do_wait_for_slave_to_stop(struct st_command *c [[maybe_unused]]) {
             "ras.SERVICE_STATE='ON' AND rcs.SERVICE_STATE='ON'") ||
         !(res = mysql_store_result_wrapper(mysql)))
 
-      die("Query failed while probing slave for stop: %s", mysql_error(mysql));
+      die("Query failed while probing replica for stop: %s",
+          mysql_error(mysql));
 
     if (!(row = mysql_fetch_row_wrapper(res)) || !row[1]) {
       mysql_free_result_wrapper(res);
-      die("Strange result from query while probing slave for stop");
+      die("Strange result from query while probing replica for stop");
     }
     done = !std::strcmp(row[1], "OFF");
     mysql_free_result_wrapper(res);
@@ -5030,7 +5031,7 @@ static void do_sync_with_master2(struct st_command *command, long offset) {
         incorrect, or an error has occurred
       */
       die("%.*s failed: '%s' returned NULL "
-          "indicating slave SQL thread failure",
+          "indicating replica SQL thread failure",
           static_cast<int>(command->first_word_len), command->query, query_buf);
     }
 

libbinlogevents/src/statement_events.cpp

@@ -271,7 +271,7 @@ Query_event::Query_event(const char *buf, const Format_description_event *fde,
         }
 
         if (mts_accessed_dbs == 0)
-          READER_THROW("Invalid MTS accessed databases");
+          READER_THROW("Invalid MTA accessed databases");
 
         for (i = 0;
              i < mts_accessed_dbs && READER_CALL(position) < end_variable_part;
@@ -292,7 +292,7 @@ Query_event::Query_event(const char *buf, const Format_description_event *fde,
           }
 #endif
           if (READER_CALL(position) >= end_variable_part)
-            READER_THROW("Error reading MTS accessed databases");
+            READER_THROW("Error reading MTA accessed databases");
 
           remaining = end_variable_part - READER_CALL(position);
           READER_TRY_CALL(strncpyz, mts_accessed_db_names[i],

libmysql/errmsg.cc

@@ -55,10 +55,10 @@ const char *client_errors[] = {
     "Can't initialize character set %-.32s (path: %-.100s)",
     "Got packet bigger than 'max_allowed_packet' bytes",
     "Embedded server",
-    "Error on SHOW SLAVE STATUS:",
-    "Error on SHOW SLAVE HOSTS:",
-    "Error connecting to slave:",
-    "Error connecting to master:",
+    "Error on SHOW REPLICA STATUS:",
+    "Error on SHOW REPLICA HOSTS:",
+    "Error connecting to replica:",
+    "Error connecting to source:",
     "SSL connection error: %-.100s",
     "Malformed packet",
     "This client library is licensed only for use with MySQL servers having "

mysql-test/extra/binlog_tests/binlog.test

@@ -399,7 +399,7 @@ SHOW SESSION VARIABLES LIKE "%_checks";
 --echo # INSERT INTO t1 VALUES(2)
 --echo # foreign_key_checks=1 and unique_checks=1
 --echo # It should not change current session's variables, even error happens
-call mtr.add_suppression("Slave SQL.*Could not execute Write_rows_v1 event on table test.t1; Duplicate entry .2. for key .t1.PRIMARY., Error_code: 1062"); 
+call mtr.add_suppression("Replica SQL.*Could not execute Write_rows_v1 event on table test.t1; Duplicate entry .2. for key .t1.PRIMARY., Error_code: 1062"); 
 --error 1062
 BINLOG '
 dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=

mysql-test/extra/rpl_tests/mts_spco_generate_deadlock_setup.inc

@@ -11,12 +11,12 @@ if ($mts_spco_gd_innodb_wait_timeout == '')
 --source include/stop_slave_sql.inc
 
 set session sql_log_bin=0;
-CALL mtr.add_suppression(".*Worker.*failed executing transaction.*at master log .*, end_log_pos.*Deadlock found when trying to get lock.*");
-CALL mtr.add_suppression(".*Worker.*failed executing transaction.*at master log .*, end_log_pos.*Can not lock user management caches for processing.*");
-CALL mtr.add_suppression(".*Worker.*failed executing transaction.*at master log .*, end_log_pos.*Replica worker has stopped after at least one previous worker.*");
+CALL mtr.add_suppression(".*Worker.*failed executing transaction.*at source log .*, end_log_pos.*Deadlock found when trying to get lock.*");
+CALL mtr.add_suppression(".*Worker.*failed executing transaction.*at source log .*, end_log_pos.*Can not lock user management caches for processing.*");
+CALL mtr.add_suppression(".*Worker.*failed executing transaction.*at source log .*, end_log_pos.*Replica worker has stopped after at least one previous worker.*");
 CALL mtr.add_suppression(".*worker thread retried transaction.*time.*in vain, giving up.*");
-CALL mtr.add_suppression(".*The slave coordinator and worker threads are stopped.*");
-CALL mtr.add_suppression(".*Slave worker has stopped after at least one previous worker encountered an error when replica-preserve-commit-order was enabled.*");
+CALL mtr.add_suppression(".*The replica coordinator and worker threads are stopped.*");
+CALL mtr.add_suppression(".*Replica worker has stopped after at least one previous worker encountered an error when replica-preserve-commit-order was enabled.*");
 set session sql_log_bin=1;
 
 --let $saved_replica_parallel_type = `SELECT @@GLOBAL.replica_parallel_type`

mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test

@@ -29,7 +29,7 @@
 --source include/have_myisam.inc
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Option binlog_cache_size ");
-call mtr.add_suppression("Slave SQL for channel '': The incident LOST_EVENTS occurred on the master.");
+call mtr.add_suppression("Replica SQL for channel '': The incident LOST_EVENTS occurred on the source.");
 call mtr.add_suppression("The content of the statement cache is corrupted "
                          "while writing a rollback record of the transaction "
                          "to the binary log. An incident event has been "
@@ -79,7 +79,7 @@ eval INSERT INTO t2 (a, data) VALUES (2,
 --enable_query_log
 
 # Incident event
-# 13119=ER_SLAVE_INCIDENT
+# 13119=ER_REPLICA_INCIDENT
 --let $slave_sql_errno= 13119
 --source include/wait_for_slave_sql_error_and_skip.inc
 
@@ -99,7 +99,7 @@ eval UPDATE t2, t1 SET t2.data = CONCAT($data, $data, $data, $data),
                        t1.data = CONCAT($data, $data, $data, $data);
 --enable_query_log
 
-# 13119=ER_SLAVE_INCIDENT
+# 13119=ER_REPLICA_INCIDENT
 --let $slave_sql_errno= 13119
 --let $slave_skip_counter= `SELECT IF(@@binlog_format = 'ROW', 2, 1)`
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -432,8 +432,8 @@ source include/start_slave.inc;
 CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
 CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
 CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
-CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log");
-call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+CALL mtr.add_suppression("Replica SQL.*The incident LOST_EVENTS occurred on the source. Message: error writing to the binary log");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 connection master;
 TRUNCATE t1;

mysql-test/extra/rpl_tests/rpl_change_master.test

@@ -2,7 +2,7 @@
 # thread) restart from where SQL thread left, not from where
 # I/O thread left (some old bug fixed in 4.0.17)
 
-call mtr.add_suppression("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it tried to SET @master_binlog_checksum");
+call mtr.add_suppression("Replica I/O: The replica I/O thread stops because a fatal error is encountered when it tried to SET @master_binlog_checksum");
 
 --connection default
 let $check_ipv6_just_check=1;

mysql-test/extra/rpl_tests/rpl_conflicts.test

@@ -94,8 +94,8 @@ if (`SELECT @@global.binlog_format != 'ROW' OR @@global.replica_exec_mode = 'STR
   --let $errno= query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1)
   --eval SELECT "$errno" as 'Last_SQL_Errno'
 
-  call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .t1.PRIMARY.* Error_code: MY-001062");
-  call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+  call mtr.add_suppression("Replica SQL.*Duplicate entry .1. for key .t1.PRIMARY.* Error_code: MY-001062");
+  call mtr.add_suppression("The replica coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
   SELECT * FROM t1;
 
@@ -140,7 +140,7 @@ connection slave;
 # replication continues.
 if (`SELECT @@global.binlog_format = 'ROW' AND @@global.replica_exec_mode = 'STRICT'`) {
   --echo ---- Wait until slave stops with an error ----
-  call mtr.add_suppression("Slave SQL.*Can.t find record in .t1., Error_code: 1032");
+  call mtr.add_suppression("Replica SQL.*Can.t find record in .t1., Error_code: 1032");
 
   let $slave_sql_errno= convert_error(ER_KEY_NOT_FOUND);
   source include/wait_for_slave_sql_error.inc;

mysql-test/extra/rpl_tests/rpl_deadlock.test

@@ -205,6 +205,6 @@ DROP TABLE t1,t2,t3;
 sync_slave_with_master;
 SET global max_relay_log_size= @my_max_relay_log_size;
 CALL mtr.add_suppression(".*worker thread retried transaction.*");
-CALL mtr.add_suppression(".*The slave coordinator and worker threads are stopped.*");
+CALL mtr.add_suppression(".*The replica coordinator and worker threads are stopped.*");
 --echo End of 5.1 tests
 --source include/rpl_end.inc

mysql-test/extra/rpl_tests/rpl_extra_col_master.test

@@ -125,12 +125,12 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
 #connection slave;
 
 --disable_query_log
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* MY-001535");
-call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: MY-001091");
-call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: MY-001054");
-call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: MY-001072");
-call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: MY-013146");
-call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+call mtr.add_suppression("Replica SQL.*Table definition on source and replica does not match: Column 2 type mismatch.* MY-001535");
+call mtr.add_suppression("Replica.*Can.t DROP .c7.; check that column.key exists.* Error_code: MY-001091");
+call mtr.add_suppression("Replica.*Unknown column .c7. in .t15.* Error_code: MY-001054");
+call mtr.add_suppression("Replica.*Key column .c6. doesn.t exist in table.* Error_code: MY-001072");
+call mtr.add_suppression("Replica SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: MY-013146");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 --enable_query_log
 
 sync_slave_with_master;
@@ -487,7 +487,7 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
 --echo
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo
@@ -541,7 +541,7 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
 --echo
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo

mysql-test/extra/rpl_tests/rpl_extra_col_slave.test

@@ -12,9 +12,9 @@
 #          should stop the slave.               #
 #################################################
 
-call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
-call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: MY-013146");
-call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+call mtr.add_suppression("Replica: Unknown table 'test.t6' Error_code: 1051");
+call mtr.add_suppression("Replica SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: MY-013146");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 --echo **** Diff Table Def Start ****
 
@@ -93,7 +93,7 @@ INSERT INTO t2 () VALUES(1,2,'Kyle, TEX'),(2,1,'JOE AUSTIN'),(3,4,'QA TESTING');
 SELECT * FROM t2 ORDER BY a;
 
 connection slave;
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error.inc
 STOP SLAVE;
 
@@ -139,11 +139,11 @@ set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
 
 --echo ******************************************************************
---echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo *** Expect slave to fail with Error ER_REPLICA_CONVERSION_FAILED ***
 --echo ******************************************************************
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo *** Drop t3  ***
@@ -181,11 +181,11 @@ INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
                         (30000.22,4,'QA TESTING');
 
 --echo ******************************************************************
---echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo *** Expect slave to fail with Error ER_REPLICA_CONVERSION_FAILED ***
 --echo ******************************************************************
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 
@@ -224,11 +224,11 @@ INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
                         (2,'JOE',300.01,0,'b2b2',1.0000009);
 
 --echo ******************************************************************
---echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo *** Expect slave to fail with Error ER_REPLICA_CONVERSION_FAILED ***
 --echo ******************************************************************
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 
@@ -268,10 +268,10 @@ INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
                         (2,'JOE',300.01,0);
 
 --echo ******************************************************************
---echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo *** Expect slave to fail with Error ER_REPLICA_CONVERSION_FAILED ***
 --echo ******************************************************************
 connection slave;
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 
@@ -493,11 +493,11 @@ set @b1 = concat(@b1,@b1);
 INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
 --echo ******************************************************************
---echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo *** Expect slave to fail with Error ER_REPLICA_CONVERSION_FAILED ***
 --echo ******************************************************************
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 
@@ -535,11 +535,11 @@ set @b1 = concat(@b1,@b1);
 INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
 --echo ******************************************************************
---echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo *** Expect slave to fail with Error ER_REPLICA_CONVERSION_FAILED ***
 --echo ******************************************************************
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 
@@ -791,7 +791,7 @@ connection slave;
 
 call mtr.add_suppression("Error .Unknown table .t6.. on query.* Error_code: 1051");
 call mtr.add_suppression("Error .Duplicate column name .c6.. on query.* Error_code: MY-001060");
-call mtr.add_suppression("Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
+call mtr.add_suppression("Table definition on source and replica does not match: Column . ...e mismatch.* Error_code: 1535");
 
 --echo *** Master Data Insert ***
 connection master;
@@ -925,11 +925,11 @@ connection master;
 INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
 
 --echo ******************************************************************
---echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo *** Expect slave to fail with Error ER_REPLICA_CONVERSION_FAILED ***
 --echo ******************************************************************
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= convert_error(ER_SERVER_SLAVE_CONVERSION_FAILED)
+--let $slave_sql_errno= convert_error(ER_SERVER_REPLICA_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo ** DROP table t17 ***

mysql-test/extra/rpl_tests/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.inc

@@ -78,7 +78,7 @@ if ($use_xa)
 --source include/sync_slave_io_with_master.inc
 
 # Wait until the slave reports the error
---let $slave_sql_errno= convert_error(ER_SLAVE_FATAL_ERROR)
+--let $slave_sql_errno= convert_error(ER_REPLICA_FATAL_ERROR)
 --source include/wait_for_slave_sql_error.inc
 
 --source include/remove_debug_point.inc

mysql-test/extra/rpl_tests/rpl_gtid_xa_cmd_do_db_filter.test

@@ -83,7 +83,7 @@ if ($rpl_use_before_xa_cmd == '') {
 --source include/master-slave.inc
 
 SET SESSION sql_log_bin = 0;
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it is being used inside a XA transaction. Concurrent XA transactions may deadlock on slaves when replicated using statements*");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it is being used inside a XA transaction. Concurrent XA transactions may deadlock on replicas when replicated using statements*");
 SET SESSION sql_log_bin = 1;
 
 --echo # 1. Setup scenario:
@@ -96,7 +96,7 @@ CREATE TABLE dodb.t (a INT);
 --source include/sync_slave_sql_with_master.inc
 
 SET SESSION sql_log_bin = 0;
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it is being used inside a XA transaction. Concurrent XA transactions may deadlock on slaves when replicated using statements*");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it is being used inside a XA transaction. Concurrent XA transactions may deadlock on replicas when replicated using statements*");
 SET SESSION sql_log_bin = 1;