PS-269 (Initial Percona Server 8.0.12 tree)

Trivial testsuite updates
inikep · Jun 7, 2022 · 9c4139d · 9c4139d
1 parent 453519f
commit 9c4139d
Show file tree

Hide file tree

Showing 35 changed files with 278 additions and 248 deletions.
diff --git a/mysql-test/suite/binlog_encryption/my.cnf b/mysql-test/suite/binlog_encryption/my.cnf
@@ -6,7 +6,7 @@
 [mysqld.1]
 encrypt-binlog=1
 master-verify-checksum=1
-log-bin=master-bin
+log-bin=binlog
 plugin_dir=@env.KEYRING_PLUGIN_DIR
 early-plugin-load=@env.KEYRING_PLUGIN
 keyring_file_data=../../tmp/keyring1

diff --git a/mysql-test/suite/binlog_encryption/r/binlog_incident.result b/mysql-test/suite/binlog_encryption/r/binlog_incident.result
@@ -19,9 +19,9 @@ CREATE TABLE t1(c1 INT PRIMARY KEY, data TEXT(30000)) ENGINE=MyIsam;
 Got one of the listed errors
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(c1 INT PRIMARY KEY, data TEXT(30000)) ENGINE=MyIsam
-master-bin.000001	#	Incident	#	#	#1 (LOST_EVENTS)
-master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
+binlog.000001	#	Query	#	#	use `test`; CREATE TABLE t1(c1 INT PRIMARY KEY, data TEXT(30000)) ENGINE=MyIsam
+binlog.000001	#	Incident	#	#	#1 (LOST_EVENTS)
+binlog.000001	#	Rotate	#	#	binlog.000002;pos=POS
 DROP TABLE t1;
 Contain RELOAD DATABASE
 1