diff --git a/mysql-test/suite/rpl_encryption/r/rpl_upgrade_slave_master_info.result b/mysql-test/suite/rpl_encryption/r/rpl_upgrade_slave_master_info.result index ded51243ed5d..62005d15a304 100644 --- a/mysql-test/suite/rpl_encryption/r/rpl_upgrade_slave_master_info.result +++ b/mysql-test/suite/rpl_encryption/r/rpl_upgrade_slave_master_info.result @@ -33,7 +33,23 @@ CREATE TABLE `slave_master_info` ( `Ssl_crlpath` TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', `Enabled_auto_position` TINYINT(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.', PRIMARY KEY (`Host`,`Port`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information' TABLESPACE=mysql; +Warnings: +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. # Running mysql_upgrade to update slave_master_info table include/rpl_restart_server.inc [server_number=1] [connection server_1] @@ -67,6 +83,8 @@ include/sync_slave_sql.inc ALTER TABLE slave_master_info MODIFY Host CHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'The host name of the master.', ALTER COLUMN Channel_name DROP DEFAULT; +Warnings: +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. include/stop_slave.inc CALL mtr.add_suppression('Info table has a problem with its key field.*slave_master_info'); CALL mtr.add_suppression('Error in checking mysql.slave_master_info repository info type of TABLE'); @@ -75,6 +93,8 @@ ALTER TABLE slave_master_info MODIFY Channel_name CHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'The channel on which the slave is connected to a source. Used in Multisource Replication' AFTER Tls_version; +Warnings: +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. RESET SLAVE ALL; ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log include/assert_grep.inc [Found the expected error line in the error log.] @@ -86,6 +106,8 @@ ALTER TABLE slave_master_info MODIFY Channel_name CHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'The channel on which the slave is connected to a source. Used in Multisource Replication' AFTER Enabled_auto_position; +Warnings: +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. include/rpl_restart_server.inc [server_number=1] RESET SLAVE ALL; CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_LOG_FILE='FILE', MASTER_LOG_POS=POS; @@ -104,24 +126,26 @@ CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER Warnings: Note 1759 Sending passwords in plain text without SSL/TLS is extremely insecure. Note 1760 Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. -include/start_slave.inc +include/start_slave.inc [FOR CHANNEL 'channel_1'] [connection server_2] INSERT INTO t1 VALUES (3); -include/sync_slave_sql_with_master.inc -include/stop_slave.inc +include/sync_slave_sql_with_master.inc [FOR CHANNEL 'channel_1'] +include/stop_slave.inc [FOR CHANNEL 'channel_1'] CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_LOG_FILE='FILE', MASTER_LOG_POS=POS FOR CHANNEL 'channel_2'; Warnings: Note 1759 Sending passwords in plain text without SSL/TLS is extremely insecure. Note 1760 Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. -include/start_slave.inc +include/start_slave.inc [FOR CHANNEL 'channel_2'] [connection server_2] INSERT INTO t1 VALUES (4); -include/sync_slave_sql_with_master.inc -include/stop_slave.inc +include/sync_slave_sql_with_master.inc [FOR CHANNEL 'channel_2'] +include/stop_slave.inc [FOR CHANNEL 'channel_2'] ALTER TABLE slave_master_info MODIFY Channel_name CHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'The channel on which the slave is connected to a source. Used in Multisource Replication' AFTER Tls_version; +Warnings: +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. include/rpl_restart_server.inc [server_number=1] RESET SLAVE ALL; ERROR HY000: Slave is not configured or failed to initialize properly. You must at least set --server-id to enable either a master or a slave. Additional error messages can be found in the MySQL error log. @@ -130,6 +154,8 @@ ALTER TABLE slave_master_info MODIFY Channel_name CHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'The channel on which the slave is connected to a source. Used in Multisource Replication' AFTER Enabled_auto_position; +Warnings: +Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. include/rpl_restart_server.inc [server_number=1] include/stop_slave.inc RESET SLAVE ALL; diff --git a/sql/binlog.cc b/sql/binlog.cc index 9d2ed73c9fa3..d89f39af2e8a 100644 --- a/sql/binlog.cc +++ b/sql/binlog.cc @@ -7022,8 +7022,7 @@ bool MYSQL_BIN_LOG::write_buffer(uchar *buf, uint len, Master_info *mi) { if (crypto.is_enabled()) { ebuf = reinterpret_cast( my_malloc(PSI_NOT_INSTRUMENTED, len, MYF(MY_WME))); - if (!ebuf || - encrypt_event(my_b_append_tell(&log_file), crypto, buf, ebuf, len)) { + if (!ebuf || encrypt_event(my_b_tell(&log_file), crypto, buf, ebuf, len)) { if (ebuf != nullptr) my_free(ebuf); DBUG_RETURN(true); }