update test results for embedded

3 files changed, 1 insertions, 228 deletions

diff --git a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
index b1177cadd19..29c07eefc49 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
@@ -198,20 +198,6 @@ def	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varc
 def	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG	4		NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)				
 def	information_schema	KEY_COLUMN_USAGE	TABLE_NAME	6		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA	5		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	LOCALES	DECIMAL_POINT	6		NO	varchar	2	6	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2)				
-def	information_schema	LOCALES	DESCRIPTION	3		NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)				
-def	information_schema	LOCALES	ERROR_MESSAGE_LANGUAGE	8		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	LOCALES	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)				
-def	information_schema	LOCALES	MAX_DAY_NAME_LENGTH	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)				
-def	information_schema	LOCALES	MAX_MONTH_NAME_LENGTH	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(4)				
-def	information_schema	LOCALES	NAME	2		NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)				
-def	information_schema	LOCALES	THOUSAND_SEP	7		NO	varchar	2	6	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2)				
-def	information_schema	METADATA_LOCK_INFO	LOCK_DURATION	3	NULL	YES	varchar	30	90	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(30)				
-def	information_schema	METADATA_LOCK_INFO	LOCK_MODE	2	NULL	YES	varchar	24	72	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(24)				
-def	information_schema	METADATA_LOCK_INFO	LOCK_TYPE	4	NULL	YES	varchar	30	90	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(30)				
-def	information_schema	METADATA_LOCK_INFO	TABLE_NAME	6	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	METADATA_LOCK_INFO	TABLE_SCHEMA	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	METADATA_LOCK_INFO	THREAD_ID	1	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
 def	information_schema	PARAMETERS	CHARACTER_MAXIMUM_LENGTH	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)				
 def	information_schema	PARAMETERS	CHARACTER_OCTET_LENGTH	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)				
 def	information_schema	PARAMETERS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
@@ -281,14 +267,6 @@ def	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	NUL
 def	information_schema	PROCESSLIST	TIME	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(7)				
 def	information_schema	PROCESSLIST	TIME_MS	9	0.000	NO	decimal	NULL	NULL	22	3	NULL	NULL	NULL	decimal(22,3)				
 def	information_schema	PROCESSLIST	USER	2		NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)				
-def	information_schema	QUERY_CACHE_INFO	RESULT_BLOCKS_COUNT	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)				
-def	information_schema	QUERY_CACHE_INFO	RESULT_BLOCKS_SIZE	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(11)				
-def	information_schema	QUERY_CACHE_INFO	RESULT_BLOCKS_SIZE_USED	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(11)				
-def	information_schema	QUERY_CACHE_INFO	STATEMENT_SCHEMA	1		NO	varchar	192	576	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(192)				
-def	information_schema	QUERY_CACHE_INFO	STATEMENT_TEXT	2	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
-def	information_schema	QUERY_RESPONSE_TIME	COUNT	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned				
-def	information_schema	QUERY_RESPONSE_TIME	TIME	1		NO	varchar	14	42	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(14)				
-def	information_schema	QUERY_RESPONSE_TIME	TOTAL	3		NO	varchar	14	42	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(14)				
 def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1		NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)				
 def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
@@ -745,20 +723,6 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	LOCALES	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	LOCALES	NAME	varchar	255	765	utf8	utf8_general_ci	varchar(255)
-3.0000	information_schema	LOCALES	DESCRIPTION	varchar	255	765	utf8	utf8_general_ci	varchar(255)
-NULL	information_schema	LOCALES	MAX_MONTH_NAME_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(4)
-NULL	information_schema	LOCALES	MAX_DAY_NAME_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	LOCALES	DECIMAL_POINT	varchar	2	6	utf8	utf8_general_ci	varchar(2)
-3.0000	information_schema	LOCALES	THOUSAND_SEP	varchar	2	6	utf8	utf8_general_ci	varchar(2)
-3.0000	information_schema	LOCALES	ERROR_MESSAGE_LANGUAGE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	METADATA_LOCK_INFO	THREAD_ID	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-3.0000	information_schema	METADATA_LOCK_INFO	LOCK_MODE	varchar	24	72	utf8	utf8_general_ci	varchar(24)
-3.0000	information_schema	METADATA_LOCK_INFO	LOCK_DURATION	varchar	30	90	utf8	utf8_general_ci	varchar(30)
-3.0000	information_schema	METADATA_LOCK_INFO	LOCK_TYPE	varchar	30	90	utf8	utf8_general_ci	varchar(30)
-3.0000	information_schema	METADATA_LOCK_INFO	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	METADATA_LOCK_INFO	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	PARAMETERS	SPECIFIC_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	PARAMETERS	SPECIFIC_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	PARAMETERS	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -828,14 +792,6 @@ NULL	information_schema	PROCESSLIST	PROGRESS	decimal	NULL	NULL	NULL	NULL	decimal
 NULL	information_schema	PROCESSLIST	MEMORY_USED	int	NULL	NULL	NULL	NULL	int(7)
 NULL	information_schema	PROCESSLIST	EXAMINED_ROWS	int	NULL	NULL	NULL	NULL	int(7)
 NULL	information_schema	PROCESSLIST	QUERY_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
-3.0000	information_schema	QUERY_CACHE_INFO	STATEMENT_SCHEMA	varchar	192	576	utf8	utf8_general_ci	varchar(192)
-1.0000	information_schema	QUERY_CACHE_INFO	STATEMENT_TEXT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
-NULL	information_schema	QUERY_CACHE_INFO	RESULT_BLOCKS_COUNT	int	NULL	NULL	NULL	NULL	int(11)
-NULL	information_schema	QUERY_CACHE_INFO	RESULT_BLOCKS_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(11)
-NULL	information_schema	QUERY_CACHE_INFO	RESULT_BLOCKS_SIZE_USED	bigint	NULL	NULL	NULL	NULL	bigint(11)
-3.0000	information_schema	QUERY_RESPONSE_TIME	TIME	varchar	14	42	utf8	utf8_general_ci	varchar(14)
-NULL	information_schema	QUERY_RESPONSE_TIME	COUNT	int	NULL	NULL	NULL	NULL	int(11) unsigned
-3.0000	information_schema	QUERY_RESPONSE_TIME	TOTAL	varchar	14	42	utf8	utf8_general_ci	varchar(14)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
diff --git a/mysql-test/suite/funcs_1/r/is_tables_is_embedded.result b/mysql-test/suite/funcs_1/r/is_tables_is_embedded.result
index 2e6c955081f..daa3ce83ba2 100644
--- a/mysql-test/suite/funcs_1/r/is_tables_is_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_tables_is_embedded.result
@@ -428,52 +428,6 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	LOCALES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
-TABLE_NAME	METADATA_LOCK_INFO
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MYISAM_OR_MARIA
@@ -566,52 +520,6 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	QUERY_CACHE_INFO
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
-TABLE_NAME	QUERY_RESPONSE_TIME
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1456,52 +1364,6 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	LOCALES
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
-TABLE_NAME	METADATA_LOCK_INFO
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MYISAM_OR_MARIA
@@ -1594,52 +1456,6 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	QUERY_CACHE_INFO
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
-TABLE_NAME	QUERY_RESPONSE_TIME
-TABLE_TYPE	SYSTEM VIEW
-ENGINE	MEMORY
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
diff --git a/mysql-test/suite/roles/i_s_applicable_roles_is_default.test b/mysql-test/suite/roles/i_s_applicable_roles_is_default.test
index 5ca8738695a..4a844e39b87 100644
--- a/mysql-test/suite/roles/i_s_applicable_roles_is_default.test
+++ b/mysql-test/suite/roles/i_s_applicable_roles_is_default.test
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
 --enable_connect_log
 create user foo;
 create role role1;