Merge branch '10.8' into 10.9

4 files changed, 33 insertions, 32 deletions

diff --git a/mysql-test/suite/perfschema/r/prepared_statements.result b/mysql-test/suite/perfschema/r/prepared_statements.result
index c11b486094e..0b9a438cd2a 100644
--- a/mysql-test/suite/perfschema/r/prepared_statements.result
+++ b/mysql-test/suite/perfschema/r/prepared_statements.result
@@ -11,7 +11,7 @@ PREPARE st2 FROM @s;
 PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?';
 PREPARE st4 FROM
 '(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st1
 SQL_TEXT	SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse
 COUNT_REPREPARE	0
@@ -88,7 +88,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/select
-SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -118,7 +118,7 @@ a
 42
 80
 90
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st1
 SQL_TEXT	SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse
 COUNT_REPREPARE	0
@@ -195,7 +195,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/select
-SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -240,12 +240,12 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/select
-SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 TRUNCATE TABLE performance_schema.prepared_statements_instances ;
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st1
 SQL_TEXT	SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse
 COUNT_REPREPARE	0
@@ -279,7 +279,7 @@ DEALLOCATE PREPARE st2;
 DEALLOCATE PREPARE st3;
 DEALLOCATE PREPARE st4;
 DROP TABLE t1;
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
 EVENT_NAME	statement/sql/truncate
 SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
@@ -328,7 +328,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/select
-SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -373,7 +373,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/select
-SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -388,7 +388,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/select
-SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -418,7 +418,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/select
-SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -433,7 +433,7 @@ PREPARE st2 FROM @s;
 PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?';
 PREPARE st4 FROM
 '(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
 EVENT_NAME	statement/sql/truncate
 SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
@@ -466,7 +466,7 @@ a
 42
 80
 90
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
 EVENT_NAME	statement/sql/truncate
 SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
@@ -478,7 +478,7 @@ DEALLOCATE PREPARE st2;
 DEALLOCATE PREPARE st3;
 DEALLOCATE PREPARE st4;
 DROP TABLE t1;
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
 EVENT_NAME	statement/sql/truncate
 SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
@@ -488,7 +488,7 @@ OBJECT_NAME	NULL
 TRUNCATE TABLE performance_schema.events_statements_history_long ;
 UPDATE performance_schema.setup_consumers SET ENABLED = 'YES';
 PREPARE st FROM 'SELECT SUM(1000 + ?) AS total';
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -500,7 +500,7 @@ SET @d=100;
 EXECUTE st USING @d;
 total
 1100
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -512,7 +512,7 @@ SET @d = @d + 100;
 EXECUTE st USING @d;
 total
 1200
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -524,7 +524,7 @@ SET @d = @d + 100;
 EXECUTE st USING @d;
 total
 1300
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -536,7 +536,7 @@ SET @d = @d + 100;
 EXECUTE st USING @d;
 total
 1400
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -548,7 +548,7 @@ SET @d = @d + 100;
 EXECUTE st USING @d;
 total
 1500
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -560,7 +560,7 @@ SET @d = @d + 100;
 EXECUTE st USING @d;
 total
 1600
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -569,7 +569,7 @@ SUM_ROWS_SENT	6
 SUM_SELECT_SCAN	0
 SUM_NO_INDEX_USED	0
 TRUNCATE TABLE performance_schema.prepared_statements_instances ;
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -583,7 +583,7 @@ SET @d=3274;
 EXECUTE st USING @d;
 total
 4274
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT SUM(1000 + ?) AS total
 COUNT_REPREPARE	0
@@ -594,7 +594,7 @@ SUM_NO_INDEX_USED	0
 UPDATE performance_schema.setup_instruments SET ENABLED = 'NO'
        WHERE NAME like "statement/sql/prepare%";
 DEALLOCATE PREPARE st;
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 UPDATE performance_schema.setup_instruments SET ENABLED = 'YES'
        WHERE NAME like "statement/sql/prepare%";
 UPDATE performance_schema.setup_instruments SET ENABLED = 'YES' 
@@ -606,7 +606,7 @@ age  INT
 );
 INSERT INTO tab VALUES(1,"Nakshatr",25),(2,"chanda",24),(3,"tejas",78);
 PREPARE st FROM 'SELECT * FROM tab';
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT * FROM tab
 COUNT_REPREPARE	0
@@ -619,7 +619,7 @@ Id	name	age
 1	Nakshatr	25
 2	chanda	24
 3	tejas	78
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT * FROM tab
 COUNT_REPREPARE	0
@@ -633,7 +633,7 @@ Id	name
 1	Nakshatr
 2	chanda
 3	tejas
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT * FROM tab
 COUNT_REPREPARE	1
@@ -647,7 +647,7 @@ Id	name	age
 1	Nakshatr	NULL
 2	chanda	NULL
 3	tejas	NULL
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT * FROM tab
 COUNT_REPREPARE	2
@@ -656,7 +656,7 @@ SUM_ROWS_SENT	9
 SUM_SELECT_SCAN	3
 SUM_NO_INDEX_USED	3
 TRUNCATE TABLE performance_schema.prepared_statements_instances ;
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 STATEMENT_NAME	st
 SQL_TEXT	SELECT * FROM tab
 COUNT_REPREPARE	0
@@ -665,7 +665,7 @@ SUM_ROWS_SENT	0
 SUM_SELECT_SCAN	0
 SUM_NO_INDEX_USED	0
 DEALLOCATE PREPARE st;
-SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT;
 TRUNCATE TABLE performance_schema.prepared_statements_instances  ;
 TRUNCATE TABLE performance_schema.events_statements_history_long ;
 DROP TABLE tab;
diff --git a/mysql-test/suite/perfschema/t/mdl_func.test b/mysql-test/suite/perfschema/t/mdl_func.test
index 7f422a6e870..7aad37ea4d4 100644
--- a/mysql-test/suite/perfschema/t/mdl_func.test
+++ b/mysql-test/suite/perfschema/t/mdl_func.test
@@ -1,5 +1,7 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+# This test fails very frequently on a Windows builder.
+--source include/not_windows.inc
 
 UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
 
diff --git a/mysql-test/suite/perfschema/t/prepared_statements.test b/mysql-test/suite/perfschema/t/prepared_statements.test
index 75d10238ac1..1c14b4cff65 100644
--- a/mysql-test/suite/perfschema/t/prepared_statements.test
+++ b/mysql-test/suite/perfschema/t/prepared_statements.test
@@ -7,7 +7,7 @@
 CREATE DATABASE db;
 USE db;
 
---let $psi_select =  SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances 
+--let $psi_select =  SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ORDER BY STATEMENT_NAME, SQL_TEXT
 --let $psi_truncate =  TRUNCATE TABLE performance_schema.prepared_statements_instances 
 --let $eshl_select = SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' 
 --let $eshl_truncate = TRUNCATE TABLE performance_schema.events_statements_history_long 
diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test
index d18f14337a9..31ba0245489 100644
--- a/mysql-test/suite/perfschema/t/short_option_1.test
+++ b/mysql-test/suite/perfschema/t/short_option_1.test
@@ -1,5 +1,4 @@
 # Work around MDEV-29508
---source include/not_valgrind.inc
 
 # Tests for PERFORMANCE_SCHEMA
 # Check server start for short server start options