PS-269 (Initial Percona Server 8.0.12 tree) - MTR tests

mysql-test/r/ctype_utf8.result

@@ -5528,6 +5528,8 @@ Warning	1260	Row 2 was cut by GROUP_CONCAT()
 # MDEV-7649 wrong result when comparing utf8 column with an invalid literal
 #
 SET NAMES utf8 COLLATE utf8_general_ci;
+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.
 #
 # Start of ctype_utf8_ilseq.inc
 #
@@ -5542,7 +5544,7 @@ t1	CREATE TABLE `t1` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
@@ -5563,8 +5565,8 @@ INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
 INSERT INTO t1 (ch) VALUES ('az'),('a?z'),('a??z'),('a???z'),('a????z');
 INSERT INTO t1 (ch) VALUES ('z');
-INSERT INTO t1 (ch) VALUES (_utf8 0x61D080);
-INSERT INTO t1 (ch) VALUES (_utf8 0x61D680);
+INSERT INTO t1 (ch) VALUES (_utf8mb3 0x61D080);
+INSERT INTO t1 (ch) VALUES (_utf8mb3 0x61D680);
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
@@ -5792,7 +5794,7 @@ t1	CREATE TABLE `t1` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
@@ -5813,8 +5815,8 @@ INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
 INSERT INTO t1 (ch) VALUES ('az'),('a?z'),('a??z'),('a???z'),('a????z');
 INSERT INTO t1 (ch) VALUES ('z');
-INSERT INTO t1 (ch) VALUES (_utf8 0x61D080);
-INSERT INTO t1 (ch) VALUES (_utf8 0x61D680);
+INSERT INTO t1 (ch) VALUES (_utf8mb3 0x61D080);
+INSERT INTO t1 (ch) VALUES (_utf8mb3 0x61D680);
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
@@ -6042,7 +6044,7 @@ t1	CREATE TABLE `t1` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`),
   KEY `ch` (`ch`)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
@@ -6063,8 +6065,8 @@ INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
 INSERT INTO t1 (ch) VALUES ('az'),('a?z'),('a??z'),('a???z'),('a????z');
 INSERT INTO t1 (ch) VALUES ('z');
-INSERT INTO t1 (ch) VALUES (_utf8 0x61D080);
-INSERT INTO t1 (ch) VALUES (_utf8 0x61D680);
+INSERT INTO t1 (ch) VALUES (_utf8mb3 0x61D080);
+INSERT INTO t1 (ch) VALUES (_utf8mb3 0x61D680);
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:

mysql-test/r/mysqldump-max.result

@@ -386,11 +386,11 @@ DROP TABLE t1;
 DROP TABLE t2;
 SHOW BINLOG EVENTS LIMIT 12,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	959	Query	1	1067	use `test`; INSERT INTO t2 VALUES (1,0), (2,0)
-master-bin.000001	1067	Xid	1	1098	COMMIT /* XID */
-master-bin.000001	1098	Anonymous_Gtid	1	1163	SET @@SESSION.GTID_NEXT= 'ANONYMOUS'
-master-bin.000001	1163	Query	1	1235	BEGIN
--- CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=1098;
+binlog.000001	1029	Query	1	1140	use `test`; INSERT INTO t2 VALUES (1,0), (2,0)
+binlog.000001	1140	Xid	1	1171	COMMIT /* XID */
+binlog.000001	1171	Anonymous_Gtid	1	1246	SET @@SESSION.GTID_NEXT= 'ANONYMOUS'
+binlog.000001	1246	Query	1	1330	BEGIN
+-- CHANGE MASTER TO MASTER_LOG_FILE='binlog.000001', MASTER_LOG_POS=1171;
 SELECT * FROM t1 ORDER BY a;
 a
 1

mysql-test/r/subquery_sj_all_bka_nixbnl.result

@@ -8571,19 +8571,11 @@ FROM t2 AS parent1 LEFT JOIN t3 AS parent2 USING (pk)
 AND grandparent1.col_varchar_key IS NOT NULL
 );
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-<<<<<<< HEAD
 1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	ROWS	100.00	Using where
 2	SUBQUERY	<subquery3>	NULL	ALL	NULL	NULL	NULL	NULL	ROWS	100.00	NULL
 2	SUBQUERY	grandparent1	NULL	ref	col_varchar_key	col_varchar_key	6	<subquery3>.p1	ROWS	100.00	Using index condition; Using join buffer (Batched Key Access)
 3	MATERIALIZED	parent1	NULL	ALL	NULL	NULL	NULL	NULL	ROWS	100.00	NULL
 3	MATERIALIZED	parent2	NULL	eq_ref	PRIMARY	PRIMARY	4	test.parent1.pk	ROWS	100.00	Using index
-=======
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	ROWS	100.00	Using where
-2	SUBQUERY	<subquery3>	NULL	ALL	NULL	NULL	NULL	NULL	ROWS	100.00	NULL
-2	SUBQUERY	grandparent1	NULL	ref	col_varchar_key	col_varchar_key	3	<subquery3>.p1	ROWS	100.00	Using index condition; Using join buffer (Batched Key Access)
-3	MATERIALIZED	parent1	NULL	ALL	NULL	NULL	NULL	NULL	ROWS	100.00	NULL
-3	MATERIALIZED	parent2	NULL	eq_ref	PRIMARY	PRIMARY	4	test.parent1.pk	ROWS	100.00	Using index
->>>>>>> 5.7-for-8.0
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`g1` AS `g1` from `test`.`t1` where (not(<in_optimizer>(`test`.`t1`.`g1`,`test`.`t1`.`g1` in ( <materialize> (/* select#2 */ select `test`.`grandparent1`.`col_varchar_nokey` AS `g1` from `test`.`t2` `grandparent1` semi join (`test`.`t2` `parent1` left join `test`.`t3` `parent2` on((`test`.`parent1`.`pk` = `test`.`parent2`.`pk`))) where ((`test`.`grandparent1`.`col_varchar_key` = `<subquery3>`.`p1`) and (`test`.`grandparent1`.`col_varchar_key` is not null)) ), <primary_index_lookup>(`test`.`t1`.`g1` in <temporary table> on <auto_key> where ((`test`.`t1`.`g1` = `materialized-subquery`.`g1`)))))))
 SELECT *

mysql-test/suite/binlog/r/percona_binlog_rotate_key.result

@@ -8,5 +8,6 @@ include/assert.inc [percona_binlog key got rotated]
 INSERT INTO t0 VALUES (rotate_system_key("percona_binlog"));
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+Pattern "Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave." found
 # restart
 DROP TABLE t0;

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

@@ -32,4 +32,5 @@ INSERT INTO t0 VALUES (rotate_system_key("percona_binlog"));
 
 # cleanup
 --remove_file $MYSQLTEST_VARDIR/tmp/percona_binlog_rotate_key.err
+--remove_file $MYSQL_TMP_DIR/mysecret_keyring
 DROP TABLE t0;

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

@@ -30,6 +30,7 @@ include/start_group_replication.inc
 SET DEBUG_SYNC= "now SIGNAL signal.recovery_continue";
 SET @@GLOBAL.DEBUG= @debug_save;
 include/gr_wait_for_member_state.inc
+SET DEBUG_SYNC= "reset";
 [connection server2]
 include/gr_wait_for_member_state.inc
 Matching lines are:

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

@@ -75,6 +75,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 --let $group_replication_member_state= ONLINE
 --source include/gr_wait_for_member_state.inc
 
+SET DEBUG_SYNC= "reset";
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 

mysql-test/suite/innodb/r/bug64663.result

@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1;
 SET SESSION expand_fast_index_creation=ON;
 CREATE TEMPORARY TABLE t1 (a INT, b INT, INDEX(a));
 call mtr.add_suppression("does not exist in the InnoDB internal");
@@ -7,30 +6,33 @@ ALTER TABLE t1 ADD INDEX (b);
 ERROR HY000: Lost connection to MySQL server during query
 SELECT NAME, FLAG FROM INFORMATION_SCHEMA.INNODB_TABLES;
 NAME	FLAG
-SYS_DATAFILES	0
-SYS_FOREIGN	0
-SYS_FOREIGN_COLS	0
-SYS_TABLESPACES	0
-SYS_VIRTUAL	0
-SYS_ZIP_DICT	0
-SYS_ZIP_DICT_COLS	0
-mysql/engine_cost	33
-mysql/gtid_executed	33
-mysql/help_category	33
-mysql/help_keyword	33
-mysql/help_relation	33
-mysql/help_topic	33
-mysql/innodb_index_stats	33
-mysql/innodb_table_stats	33
-mysql/plugin	33
-mysql/server_cost	33
-mysql/servers	33
-mysql/slave_master_info	33
-mysql/slave_relay_log_info	33
-mysql/slave_worker_info	33
-mysql/time_zone	33
-mysql/time_zone_leap_second	33
-mysql/time_zone_name	33
-mysql/time_zone_transition	33
-mysql/time_zone_transition_type	33
+mysql/db	161
+mysql/user	161
+mysql/default_roles	161
+mysql/role_edges	161
+mysql/global_grants	161
+mysql/password_history	161
+mysql/func	161
+mysql/plugin	161
+mysql/servers	161
+mysql/tables_priv	161
+mysql/columns_priv	161
+mysql/help_topic	161
+mysql/help_category	161
+mysql/help_relation	161
+mysql/help_keyword	161
+mysql/time_zone_name	161
+mysql/time_zone	161
+mysql/time_zone_transition	161
+mysql/time_zone_transition_type	161
+mysql/time_zone_leap_second	161
+mysql/procs_priv	161
+mysql/component	161
+mysql/slave_relay_log_info	161
+mysql/slave_master_info	161
+mysql/slave_worker_info	161
+mysql/gtid_executed	161
+mysql/server_cost	161
+mysql/engine_cost	161
+mysql/proxies_priv	161
 sys/sys_config	33

mysql-test/suite/innodb_fts/r/sync.result

@@ -141,6 +141,8 @@ CREATE TABLE `questions_and_answers` (
 PRIMARY KEY (`id`),
 FULLTEXT KEY `keywords` (`keywords`)
 ) ENGINE=InnoDB AUTO_INCREMENT=3620 DEFAULT CHARSET=utf8 COMMENT='Main table for Q&A module ';
+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.
 INSERT INTO `questions_and_answers` (`id`,`keywords`) VALUES (1854,'support, services, essay, writing, maths, help, advice, study, advice, advise, careers, employability, graduating, graduate, student_support, academic_support, academic_help');
 INSERT INTO `questions_and_answers` (`id`,`keywords`) VALUES (1855,'accommodation, housing, halls, residence, live, living, bed, beds, acomodation, accomodation, accommidation, acomidation, hall, campus_living, uni_living, uni_halls, university_life, university_accommodation');
 INSERT INTO `questions_and_answers` (`id`,`keywords`) VALUES (1856,'interview, interviews, audition, auditions, portfolio, review, admission, interview_preparation, booking, book, change_interview');

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

@@ -6,7 +6,7 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
-event_name	digest	digest_text	sql_text
-statement/sql/truncate	f73f197697b0fc54ceca9c4b8bcb16eb9b39b9f0e203225753679df7b285cb8e	TRUNCATE TABLE	truncate table events_statements_history_long
-statement/sql/select	80738f45acce7def2d223a60e1aaecb92bc597bb049adc1a503851c37c35f561	SELECT ? + ? +	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
+SELECT event_name, digest_text, sql_text FROM events_statements_history_long;
+event_name	digest_text	sql_text
+statement/sql/truncate	TRUNCATE TABLE	truncate table events_statements_history_long
+statement/sql/select	SELECT ? + ? +	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1

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

@@ -6,7 +6,7 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
-event_name	digest	digest_text	sql_text
-statement/sql/truncate	f73f197697b0fc54ceca9c4b8bcb16eb9b39b9f0e203225753679df7b285cb8e	TRUNCATE TABLE	truncat...
-statement/sql/select	80738f45acce7def2d223a60e1aaecb92bc597bb049adc1a503851c37c35f561	SELECT ? + ? +	SELECT ...
+SELECT event_name, digest_text, sql_text FROM events_statements_history_long;
+event_name	digest_text	sql_text
+statement/sql/truncate	TRUNCATE TABLE	truncat...
+statement/sql/select	SELECT ? + ? +	SELECT ...

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

@@ -115,7 +115,7 @@ show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_mutex_classes";
 Variable_name	Value
-performance_schema_max_mutex_classes	300
+performance_schema_max_mutex_classes	340
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/mutex/%";
 count(*) > 0

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

@@ -115,7 +115,7 @@ show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_rwlock_classes";
 Variable_name	Value
-performance_schema_max_rwlock_classes	60
+performance_schema_max_rwlock_classes	70
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/rwlock/%";
 count(*) > 0