BUG#37271768 The LOCK_TYPE in PFS.metadata_locks not change after MDL upgrade or downgrade

Post merge fix,
adjust test cases output.

Approved by: Chris Powers <[email protected]>

Change-Id: I5a3cf5ea6aac19a4e4245f986f2668c16dab1a84

Author: marcalff

mysql-test/r/mdl_tablespace.result

@@ -1031,8 +1031,8 @@ WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
 OBJECT_TYPE = 'tablespace'
 ORDER BY OBJECT_NAME;
 OBJECT_TYPE	OBJECT_NAME	LOCK_TYPE	LOCK_DURATION	LOCK_STATUS
-TABLESPACE	test/test1_tmp	EXCLUSIVE	EXPLICIT	GRANTED
-TABLE	test1_tmp	EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/test1_tmp	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLE	test1_tmp	SHARED_NO_READ_WRITE	EXPLICIT	GRANTED
 ###
 ALTER TABLE test2 RENAME test1;
 ### Locks held ###
@@ -1042,8 +1042,8 @@ WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
 OBJECT_TYPE = 'tablespace'
 ORDER BY OBJECT_NAME;
 OBJECT_TYPE	OBJECT_NAME	LOCK_TYPE	LOCK_DURATION	LOCK_STATUS
-TABLESPACE	test/test1_tmp	EXCLUSIVE	EXPLICIT	GRANTED
-TABLE	test1_tmp	EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/test1_tmp	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLE	test1_tmp	SHARED_NO_READ_WRITE	EXPLICIT	GRANTED
 ###
 UNLOCK TABLES;
 ### Locks held ###
@@ -1089,17 +1089,17 @@ WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
 OBJECT_TYPE = 'tablespace'
 ORDER BY OBJECT_NAME;
 OBJECT_TYPE	REPLACE(OBJECT_NAME, '#p#', '#P#')	LOCK_TYPE	LOCK_DURATION	LOCK_STATUS
-TABLE	part1_tmp	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p0	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p1	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p2	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p3	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p4	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p5	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p6	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p7	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p8	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p9	EXCLUSIVE	EXPLICIT	GRANTED
+TABLE	part1_tmp	SHARED_NO_READ_WRITE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p0	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p1	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p2	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p3	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p4	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p5	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p6	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p7	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p8	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p9	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
 ###
 ALTER TABLE part2 RENAME TO part1;
 ### Locks held ###
@@ -1110,17 +1110,17 @@ WHERE OBJECT_TYPE = 'table' AND OBJECT_SCHEMA = 'test' OR
 OBJECT_TYPE = 'tablespace'
 ORDER BY OBJECT_NAME;
 OBJECT_TYPE	REPLACE(OBJECT_NAME, '#p#', '#P#')	LOCK_TYPE	LOCK_DURATION	LOCK_STATUS
-TABLE	part1_tmp	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p0	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p1	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p2	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p3	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p4	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p5	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p6	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p7	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p8	EXCLUSIVE	EXPLICIT	GRANTED
-TABLESPACE	test/part1_tmp#P#p9	EXCLUSIVE	EXPLICIT	GRANTED
+TABLE	part1_tmp	SHARED_NO_READ_WRITE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p0	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p1	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p2	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p3	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p4	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p5	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p6	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p7	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p8	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
+TABLESPACE	test/part1_tmp#P#p9	INTENTION_EXCLUSIVE	EXPLICIT	GRANTED
 ###
 UNLOCK TABLES;
 ### Locks held ###