fix main.mdl failure in --embedded

MariaDB · Jul 5, 2017 · 0e6c6d6 · 0e6c6d6
1 parent e022c22
commit 0e6c6d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/mysql-test/r/mdl.result b/mysql-test/r/mdl.result
@@ -7,16 +7,16 @@
 #
 CREATE TABLE t1(a INT) ENGINE=InnoDB;
 LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ;
-SELECT * FROM information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-9	MDL_INTENTION_EXCLUSIVE	NULL	Global read lock		
-9	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
+SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_INTENTION_EXCLUSIVE	Global read lock		
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
 UNLOCK TABLES;
 LOCK TABLES t1 AS t2 READ, t1 WRITE CONCURRENT;
-SELECT * FROM information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-9	MDL_INTENTION_EXCLUSIVE	NULL	Global read lock		
-9	MDL_SHARED_WRITE	NULL	Table metadata lock	test	t1
-9	MDL_SHARED_READ_ONLY	NULL	Table metadata lock	test	t1
+SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_INTENTION_EXCLUSIVE	Global read lock		
+MDL_SHARED_WRITE	Table metadata lock	test	t1
+MDL_SHARED_READ_ONLY	Table metadata lock	test	t1
 UNLOCK TABLES;
 DROP TABLE t1;
diff --git a/mysql-test/t/mdl.test b/mysql-test/t/mdl.test
@@ -11,9 +11,9 @@
 
 CREATE TABLE t1(a INT) ENGINE=InnoDB;
 LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ;
-SELECT * FROM information_schema.metadata_lock_info;
+SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info;
 UNLOCK TABLES;
 LOCK TABLES t1 AS t2 READ, t1 WRITE CONCURRENT;
-SELECT * FROM information_schema.metadata_lock_info;
+SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info;
 UNLOCK TABLES;
 DROP TABLE t1;