Bug#36991949 innodb.bug32554667 is failing on PB2 consistently

This test case was not ensuring any ordering of result set.
This become more prominent now that performance_schema.data_locks
scans the lock system bucket-by-bucket so order depends on hash function
internal details (such as number of buckets which is tied to size of
buffer pool etc.).

Solution:
I have added --sorted_result before the SELECT
Also, I've searched through other test cases to for selects to
performance_schema.data_locks and data_lock_waits, and verified that
they either sort the result set via ORDER BY, or --sorted_result, or
ignore the result, or result must have 1 or 0 rows, etc.

Change-Id: I64734166a96179a8c80bb654c8cc7be6917dcc52

Author: Jakub Łopuszański

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

@@ -21,8 +21,8 @@ b	c	d
 select INDEX_NAME,LOCK_TYPE,LOCK_MODE,LOCK_STATUS,LOCK_DATA from performance_schema.data_locks;
 INDEX_NAME	LOCK_TYPE	LOCK_MODE	LOCK_STATUS	LOCK_DATA
 NULL	TABLE	IX	GRANTED	NULL
-b	RECORD	X,REC_NOT_GAP	GRANTED	7, 7, 7
 PRIMARY	RECORD	X,REC_NOT_GAP	GRANTED	7
+b	RECORD	X,REC_NOT_GAP	GRANTED	7, 7, 7
 commit;
 SET @@optimizer_switch='index_condition_pushdown=off';
 SELECT @@optimizer_switch LIKE '%index_condition_pushdown=on%';
@@ -41,8 +41,8 @@ b	c	d
 select INDEX_NAME,LOCK_TYPE,LOCK_MODE,LOCK_STATUS,LOCK_DATA from performance_schema.data_locks;
 INDEX_NAME	LOCK_TYPE	LOCK_MODE	LOCK_STATUS	LOCK_DATA
 NULL	TABLE	IX	GRANTED	NULL
-b	RECORD	X,REC_NOT_GAP	GRANTED	7, 7, 7
 PRIMARY	RECORD	X,REC_NOT_GAP	GRANTED	7
+b	RECORD	X,REC_NOT_GAP	GRANTED	7, 7, 7
 commit;
 SET @@optimizer_switch='index_condition_pushdown=off';
 DROP TABLE ts;

mysql-test/suite/innodb/t/bug32554667.test

@@ -8,16 +8,18 @@ ANALYZE TABLE ts;
 
 --let $i=0
 while($i<2){
-	SELECT @@optimizer_switch LIKE '%index_condition_pushdown=on%';
-	explain select b,c,d from ts where b>=5 and b<8 and c=7 for update;
-	SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
-	begin;
-	select b,c,d from ts where b>=5 and b<8 and c=7 for update;
-        --skip_if_hypergraph  # Does not use index range scan yet. TODO: Enable it after WL#14806.
-	select INDEX_NAME,LOCK_TYPE,LOCK_MODE,LOCK_STATUS,LOCK_DATA from performance_schema.data_locks;
-	commit;
-	SET @@optimizer_switch='index_condition_pushdown=off';
-	--inc $i
+  SELECT @@optimizer_switch LIKE '%index_condition_pushdown=on%';
+  explain select b,c,d from ts where b>=5 and b<8 and c=7 for update;
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
+  begin;
+  select b,c,d from ts where b>=5 and b<8 and c=7 for update;
+  # hypergraph chooses a different plan, in particular doesn't use ICP which this test is all about
+  --skip_if_hypergraph
+  --sorted_result
+  select INDEX_NAME,LOCK_TYPE,LOCK_MODE,LOCK_STATUS,LOCK_DATA from performance_schema.data_locks;
+  commit;
+  SET @@optimizer_switch='index_condition_pushdown=off';
+  --inc $i
 }
 
 DROP TABLE ts;