WL#14190: Replace old terms in replication SQL commands on the SOURCE

This worklog implements aliases for RESET MASTER, SHOW MASTER STATUS
and [CREATE|ALTER] EVENT ... DISABLE ON SLAVE. The aliases are RESET
BINARY LOGS AND GTIDS, SHOW BINARY LOG STATUS and [CREATE|ALTER] EVENT
...DISABLE ON REPLICA respectively. The storage of event information
is also changed to avoid offensive terminology. This last change will
also affect the output of the commands SHOW CREATE EVENT, SHOW EVENTS
and queries to the information_schema.events table.

Old syntax is deprecated. This worklog also deprecates PURGE MASTER
LOGS and SHOW MASTER LOGS in favor of existing syntax PURGE BINARY
LOGS and SHOW BINARY LOGS.

There is also a new status variable Com_show_binary_log_status that is
an alias to the existent Com_show_master_status.

In order to provide logical dumps that are compatible with lower
versions or external tools that only support the old deprecated
terminology we also introduce a new option for mysqldump named:
`--output-as-version`.

Change-Id: Ic6f902186314fcd13226a1a09849e1a2ee43c068

Author: pedrolgomes

client/client_priv.h

@@ -185,6 +185,7 @@ enum options_client {
   OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE,
   OPT_TLS_SNI_SERVERNAME,
   OPT_INIT_COMMAND_ADD,
+  OPT_OUTPUT_AS_VERSION,
   /* Add new option above this */
   OPT_MAX_CLIENT_OPTION
 };

client/mysqladmin.cc

@@ -751,7 +751,7 @@ static int execute_commands(MYSQL *mysql, int argc, char **argv) {
       case ADMIN_REFRESH:
         if (mysql_refresh(mysql, (uint) ~(REFRESH_GRANT | REFRESH_STATUS |
                                           REFRESH_READ_LOCK | REFRESH_REPLICA |
-                                          REFRESH_MASTER))) {
+                                          REFRESH_SOURCE))) {
           my_printf_error(0, "refresh failed; error: '%s'", error_flags,
                           mysql_error(mysql));
           return -1;

client/mysqldump.cc

@@ -5026,8 +5026,8 @@ static void do_sync_with_master2(struct st_command *command, long offset) {
 
   if (!result_str || result < 0) {
     /* source_pos_wait returned NULL or < 0 */
-    show_query(mysql, "SHOW MASTER STATUS");
-    show_query(mysql, "SHOW SLAVE STATUS");
+    show_query(mysql, "SHOW BINARY LOG STATUS");
+    show_query(mysql, "SHOW REPLICA STATUS");
     show_query(mysql, "SHOW PROCESSLIST");
     fprintf(stderr, "analyze: sync_with_master\n");
 
@@ -5191,14 +5191,14 @@ static int do_save_master_pos() {
   */
   ndb_wait_for_binlog_injector();
 
-  if (mysql_query_wrapper(mysql, query = "show master status"))
-    die("failed in 'show master status': %d %s", mysql_errno(mysql),
+  if (mysql_query_wrapper(mysql, query = "show binary log status"))
+    die("failed in 'SHOW BINARY LOG STATUS': %d %s", mysql_errno(mysql),
         mysql_error(mysql));
 
   if (!(res = mysql_store_result_wrapper(mysql)))
     die("mysql_store_result() retuned NULL for '%s'", query);
   if (!(row = mysql_fetch_row_wrapper(res)))
-    die("empty result in show master status");
+    die("empty result in SHOW BINARY LOG STATUS");
   my_stpnmov(master_pos.file, row[0], sizeof(master_pos.file) - 1);
   master_pos.pos = strtoul(row[1], (char **)nullptr, 10);
   mysql_free_result_wrapper(res);

client/mysqltest.cc

@@ -221,16 +221,21 @@
 #define REFRESH_STATUS 16  /**< Flush status variables, FLUSH STATUS */
 #define REFRESH_THREADS 32 /**< Flush thread cache */
 #define REFRESH_REPLICA                         \
-  64 /**< Reset master info and restart replica \
+  64 /**< Reset source info and restart replica \
         thread, RESET REPLICA */
 #define REFRESH_SLAVE                                        \
-  REFRESH_REPLICA /**< Reset master info and restart replica \
+  REFRESH_REPLICA /**< Reset source info and restart replica \
         thread, RESET REPLICA. This is deprecated,           \
         use REFRESH_REPLICA instead. */
 
-#define REFRESH_MASTER                                                 \
-  128                            /**< Remove all bin logs in the index \
-                                    and truncate the index, RESET MASTER */
+#define REFRESH_SOURCE                       \
+  128 /**< Remove all bin logs in the index  \
+         and truncate the index. Also resets \
+         GTID information. Command:          \
+         RESET BINARY LOGS AND GTIDS */
+#define REFRESH_MASTER \
+  REFRESH_SOURCE /**< This is deprecated, use REFRESH_SOURCE instead. */
+
 #define REFRESH_ERROR_LOG 256    /**< Rotate only the error log */
 #define REFRESH_ENGINE_LOG 512   /**< Flush all storage engine logs */
 #define REFRESH_BINARY_LOG 1024  /**< Flush the binary log */

include/mysql_com.h

@@ -5,7 +5,7 @@
 -- source include/have_log_bin.inc
 -- source include/have_debug.inc
 
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 
 create table t1 (a int) engine=innodb;
 create table t2 (a int) engine=innodb;
@@ -32,7 +32,7 @@ SET @@session.binlog_transaction_compression = FALSE;
 --enable_result_log
 --enable_query_log
 
-reset master;
+reset binary logs and gtids;
 let $1=100;
 
 create table t1 (n int) engine=innodb;
@@ -47,7 +47,7 @@ while ($1)
 commit;
 drop table t1;
 --source include/show_binlog_events.inc
---let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $binlog_file= query_get_value(SHOW BINARY LOG STATUS, File, 1)
 --source include/show_binlog_events.inc
 --let $binlog_file=
 
@@ -77,7 +77,7 @@ set @ac = @@autocommit;
 # first show this to work for SHOW BINLOG EVENTS
 
 set autocommit= 0;
-reset master;
+reset binary logs and gtids;
 create table t1(n int) engine=innodb;
 begin;
 insert into t1 values (1);
@@ -101,7 +101,7 @@ SET @@session.binlog_transaction_compression = FALSE;
 
 set @bcs = @@binlog_cache_size;
 set global binlog_cache_size=4096;
-reset master;
+reset binary logs and gtids;
 
 create table t1 (a int, b char(255)) engine=innodb;
 
@@ -139,7 +139,7 @@ SET @@session.binlog_transaction_compression = @saved_btc;
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
-reset master;
+reset binary logs and gtids;
 create table t1 (a bigint unsigned, b bigint(20) unsigned);
 prepare stmt from "insert into t1 values (?,?)";
 set @a= 9999999999999999;
@@ -154,7 +154,7 @@ drop table t1;
 # Bug #39182: Binary log producing incompatible character set query from 
 # stored procedure.
 #
-reset master;
+reset binary logs and gtids;
 CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 USE bug39182;
 CREATE TABLE t1 (a VARCHAR(255) COLLATE utf8_unicode_ci)
@@ -233,7 +233,7 @@ DROP PROCEDURE p4;
 # Test of a too big SET INSERT_ID: see if the truncated value goes
 # into binlog (right), or the too big value (wrong); we look at the
 # binlog further down with SHOW BINLOG EVENTS.
-reset master;
+reset binary logs and gtids;
 create table t1 (id tinyint auto_increment primary key);
 set insert_id=128;
 insert ignore into t1 values(null);
@@ -276,7 +276,7 @@ drop table t1,t2,t3,tt1;
 
 #Bug #26079 max_binlog_size + innodb = not make new binlog and hang server
 # server should not hang, binlog must rotate in the end
-reset master;
+reset binary logs and gtids;
 
 # temporarily disable compression for this test case, since it needs
 # to create a large binlog to rotate it.
@@ -290,21 +290,21 @@ SET @@session.binlog_transaction_compression = FALSE;
 drop table if exists t3;
 --enable_warnings
 create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb;
---let $binlog_file1= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $binlog_file1= query_get_value(SHOW BINARY LOG STATUS, File, 1)
 --echo File $binlog_file1
 let $it=4;
 while ($it)
 {
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
 dec $it;
 }
---let $binlog_file2= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $binlog_file2= query_get_value(SHOW BINARY LOG STATUS, File, 1)
 --echo *** show new binlog index after rotating ***
 --echo File $binlog_file2
 drop table t3;
 
 # clean up
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 --disable_result_log
 --disable_query_log
 SET @@session.binlog_transaction_compression = @saved_btc;
@@ -333,7 +333,7 @@ DROP TABLES t1, t2;
 connect (fresh,localhost,root,,test);
 connection fresh;
 
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 CREATE TABLE t1 (a INT PRIMARY KEY);
 
 # Format description event, with server_id = 10;

mysql-test/extra/binlog_tests/binlog.test

@@ -79,7 +79,7 @@ if ($do_only_regular_logging)
 if ($do_pre_binlog)
 {
   FLUSH LOGS;
-  --let $binlog_file= query_get_value("SHOW MASTER STATUS", File, 1)
+  --let $binlog_file= query_get_value("SHOW BINARY LOG STATUS", File, 1)
 
   #
   # prepare, the first CRASH,  /* log,  commit */
@@ -132,7 +132,7 @@ if ($do_pre_binlog)
 if ($do_post_binlog)
 {
   FLUSH LOGS;
-  --let $binlog_file= query_get_value("SHOW MASTER STATUS", File, 1)
+  --let $binlog_file= query_get_value("SHOW BINARY LOG STATUS", File, 1)
 
   #
   # prepare, log, the 2nd CRASH, /* commit */

mysql-test/extra/binlog_tests/binlog_crash_safe_ddl.inc

@@ -43,7 +43,7 @@ let $prepare = SET AUTOCOMMIT = 1;
 let $statement = SET AUTOCOMMIT = 0;
 source extra/binlog_tests/implicit.test;
 
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 SET AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (1);
 source include/show_binlog_events.inc;

mysql-test/extra/binlog_tests/binlog_implicit_commit.inc

@@ -1,7 +1,7 @@
 
 SET BINLOG_FORMAT=MIXED;
 
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB;
 INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6);

mysql-test/extra/binlog_tests/binlog_innodb.inc

@@ -22,32 +22,32 @@
 --let $datetime_1= 2031-01-01 12:00:00
 eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_1");
 INSERT INTO t1 VALUES(1);
---let $pos_1= query_get_value(SHOW MASTER STATUS, Position, 1)
+--let $pos_1= query_get_value(SHOW BINARY LOG STATUS, Position, 1)
 
 # One transaction with timestamp 2032-01-01 12:00:00
 --let $datetime_2= 2032-01-01 12:00:00
 eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_2");
 INSERT INTO t1 VALUES(2);
---let $pos_2= query_get_value(SHOW MASTER STATUS, Position, 1)
+--let $pos_2= query_get_value(SHOW BINARY LOG STATUS, Position, 1)
 
 # One transaction with timestamp 2033-01-01 12:00:00
 eval SET TIMESTAMP= UNIX_TIMESTAMP("2033-01-01 12:00:00");
 INSERT INTO t1 VALUES(3);
 
---let $file_1= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $file_1= query_get_value(SHOW BINARY LOG STATUS, File, 1)
 FLUSH LOGS;
 
 #Binlog 2:
 # One transaction with timestamp 2034-01-01 12:00:00
 SET TIMESTAMP= UNIX_TIMESTAMP("2034-01-01 12:00:00");
 INSERT INTO t1 VALUES(4);
---let $pos_3= query_get_value(SHOW MASTER STATUS, Position, 1)
+--let $pos_3= query_get_value(SHOW BINARY LOG STATUS, Position, 1)
 
 # One transaction with timestamp 2035-01-01 12:00:00
 --let $datetime_3= 2035-01-01 12:00:00
 eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_3");
 INSERT INTO t1 VALUES(5);
 
---let $file_2= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $file_2= query_get_value(SHOW BINARY LOG STATUS, File, 1)
 FLUSH LOGS;
 

mysql-test/extra/binlog_tests/binlog_mysqlbinlog_fill.inc

@@ -13,7 +13,7 @@ SET timestamp=1000000000;
 --echo #
 --echo # Delete all existing binary logs.
 --echo #
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 
 
 CREATE TABLE t1 (c01 BIT);

mysql-test/extra/binlog_tests/binlog_mysqlbinlog_row.inc

@@ -9,7 +9,7 @@
 # TODO: Need to look at making row based version once new binlog client is complete.
 
 CREATE TABLE t1 (a INT);
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 
 --source extra/binlog_tests/binlog_mysqlbinlog_fill.inc
 

mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc

@@ -21,7 +21,7 @@
 --eval CREATE TABLE t1 (c1 INT) ENGINE = $engine
 INSERT INTO t1 VALUES (1);
 INSERT INTO t1 VALUES (2);
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;
 
 # Test case1
 --connect(con1,localhost,root)

mysql-test/extra/binlog_tests/binlog_row_kill_create_select.test

@@ -125,4 +125,4 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
 
-RESET MASTER;
+RESET BINARY LOGS AND GTIDS;