Merge branch 'mysql-8.0' into mysql-trunk

Author: phulakun

mysql-test/include/resource_group_common_debug.inc

@@ -35,7 +35,7 @@ if ($thr_prio_enable == 0)
 # Insert invalid VCPU ids and enable the resource group.
 INSERT INTO mysql.resource_groups VALUES(3, 'r1', 'USER', 1, "0100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 0);
 }
-call mtr.add_suppression("Invalid VCPU ID.*");
+call mtr.add_suppression("Invalid cpu id.*");
 call mtr.add_suppression("Validation of resource group.*");
 call mtr.add_suppression("Invalid thread priority.*");
 SET SESSION debug= '-d,skip_dd_table_access_check';

mysql-test/r/resource_group_debug.result

@@ -20,7 +20,7 @@ DROP RESOURCE GROUP r1;
 # Restart with an Invalid Resource group.
 SET SESSION debug= '+d,skip_dd_table_access_check';
 INSERT INTO mysql.resource_groups VALUES(3, 'r1', 'USER', 1, "0100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", -5);
-call mtr.add_suppression("Invalid VCPU ID.*");
+call mtr.add_suppression("Invalid cpu id.*");
 call mtr.add_suppression("Validation of resource group.*");
 call mtr.add_suppression("Invalid thread priority.*");
 SET SESSION debug= '-d,skip_dd_table_access_check';

mysql-test/r/resource_group_thr_prio_unsupported_debug.result

@@ -20,7 +20,7 @@ DROP RESOURCE GROUP r1;
 # Restart with an Invalid Resource group.
 SET SESSION debug= '+d,skip_dd_table_access_check';
 INSERT INTO mysql.resource_groups VALUES(3, 'r1', 'USER', 1, "0100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 0);
-call mtr.add_suppression("Invalid VCPU ID.*");
+call mtr.add_suppression("Invalid cpu id.*");
 call mtr.add_suppression("Validation of resource group.*");
 call mtr.add_suppression("Invalid thread priority.*");
 SET SESSION debug= '-d,skip_dd_table_access_check';

mysql-test/suite/rpl/t/rpl_invalid_replication_timestamps.test

@@ -49,7 +49,7 @@ DROP TABLE t1;
 # log file
 --let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
 --let $assert_text= Invalid replication timestamps warning is present in log
---let $assert_select= Invalid replication timestamps: original commit timestamp is more recent than the immediate commmit timestamp
+--let $assert_select= Invalid replication timestamps: original commit timestamp is more recent than the immediate commit timestamp
 --let $assert_count= 1
 --let $assert_only_after= CURRENT_TEST: rpl.rpl_invalid_replication_timestamps
 --source include/assert_grep.inc

mysql-test/suite/rpl/t/rpl_invalid_replication_timestamps_multi_source.test

@@ -88,7 +88,7 @@ DROP TABLE t2;
 # log file
 --let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
 --let $assert_text= Invalid replication timestamps warning is present in log
---let $assert_select= Invalid replication timestamps: original commit timestamp is more recent than the immediate commmit timestamp
+--let $assert_select= Invalid replication timestamps: original commit timestamp is more recent than the immediate commit timestamp
 --let $assert_count= 1
 --let $assert_only_after= CURRENT_TEST: rpl.rpl_invalid_replication_timestamps_multi_source
 --source include/assert_grep.inc