un-disable a bunch of funcs_1 tests

mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc

@@ -322,7 +322,7 @@ if (!$mysql_errno)
 INSERT INTO information_schema.key_column_usage
 SELECT * FROM information_schema.key_column_usage;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.key_column_usage
 SET  table_name = 'db1' WHERE constraint_name = 'primary';
 

mysql-test/suite/funcs_1/datadict/is_tables.inc

@@ -441,7 +441,7 @@ ENGINE = $engine_type;
 INSERT INTO information_schema.tables
 SELECT * FROM information_schema.tables;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.tables SET table_schema = 'test'
 WHERE table_name = 't1';
 

mysql-test/suite/funcs_1/datadict/is_triggers.inc

@@ -236,7 +236,7 @@ ON db_datadict.t1 FOR EACH ROW SET @test_before = 2, new.f1 = @test_before;
 INSERT INTO information_schema.triggers
 SELECT * FROM information_schema.triggers;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.triggers SET trigger_schema = 'test'
 WHERE table_name = 't1';
 

mysql-test/suite/funcs_1/datadict/is_views.inc

@@ -278,7 +278,7 @@ SELECT * FROM information_schema.views;
 INSERT INTO information_schema.views(table_schema, table_name)
 VALUES ('db2', 'v2');
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.views SET table_schema = 'test'
 WHERE table_name = 't1';
 

mysql-test/suite/funcs_1/r/is_character_sets.result

@@ -57,7 +57,7 @@ INSERT INTO information_schema.character_sets
 SELECT * FROM information_schema.character_sets;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.character_sets SET description = 'just updated';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.character_sets WHERE table_name = 't1';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.character_sets;

mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result

@@ -52,10 +52,10 @@ SELECT * FROM information_schema.collation_character_set_applicability;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.collation_character_set_applicability
 SET collation_name = 'big6_chinese_ci' WHERE character_set_name = 'big6';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 UPDATE information_schema.collation_character_set_applicability
 SET character_set_name = 't_4711';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.collation_character_set_applicability;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.collation_character_set_applicability;

mysql-test/suite/funcs_1/r/is_collations.result

@@ -67,7 +67,7 @@ INSERT INTO information_schema.collations
 VALUES (  'cp1251_bin',          'cp1251',50,        '',         '',0);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.collations SET description = 'just updated';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.collations WHERE table_name = 't1';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.collations;

mysql-test/suite/funcs_1/r/is_engines.result

@@ -64,7 +64,7 @@ INSERT INTO information_schema.engines
 SELECT * FROM information_schema.engines;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.engines SET engine = '1234567';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.engines WHERE support IN ('DEFAULT','YES');
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.engines;

mysql-test/suite/funcs_1/r/is_events.result

@@ -128,7 +128,7 @@ SELECT * FROM information_schema.events;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.events SET event_name = '1234567'
 WHERE table_name = 't1';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.events WHERE event_catalog IS NULL;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.events;

mysql-test/suite/funcs_1/r/is_key_column_usage.result

@@ -399,7 +399,7 @@ SELECT * FROM information_schema.key_column_usage;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.key_column_usage
 SET  table_name = 'db1' WHERE constraint_name = 'primary';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.key_column_usage WHERE table_name = 't1';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.key_column_usage;

mysql-test/suite/funcs_1/r/is_schemata_embedded.result

@@ -28,31 +28,36 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
-CATALOG_NAME	varchar(512)	YES		NULL	
+CATALOG_NAME	varchar(512)	NO			
 SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(64)	NO			
-DEFAULT_COLLATION_NAME	varchar(64)	NO			
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
+DEFAULT_COLLATION_NAME	varchar(32)	NO			
 SQL_PATH	varchar(512)	YES		NULL	
 SHOW CREATE TABLE information_schema.SCHEMATA;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(512) DEFAULT NULL,
+  `CATALOG_NAME` varchar(512) NOT NULL DEFAULT '',
   `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
   `SQL_PATH` varchar(512) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
-CATALOG_NAME	varchar(512)	YES		NULL	
+CATALOG_NAME	varchar(512)	NO			
 SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(64)	NO			
-DEFAULT_COLLATION_NAME	varchar(64)	NO			
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
+DEFAULT_COLLATION_NAME	varchar(32)	NO			
 SQL_PATH	varchar(512)	YES		NULL	
 SELECT catalog_name, schema_name, sql_path
 FROM information_schema.schemata
 WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL;
 catalog_name	schema_name	sql_path
+def	information_schema	NULL
+def	mtr	NULL
+def	mysql	NULL
+def	performance_schema	NULL
+def	test	NULL
 ###############################################################################
 # Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information
 ###############################################################################
@@ -72,43 +77,46 @@ GRANT SELECT ON db_datadict_2.* to 'testuser2'@'localhost';
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	db_datadict_1	latin1	latin1_swedish_ci	NULL
-NULL	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
 db_datadict_2
-# Establish connection testuser1 (user=testuser1)
+connect  testuser1, localhost, testuser1, , db_datadict_1;
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	db_datadict_1	latin1	latin1_swedish_ci	NULL
-NULL	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
 db_datadict_2
-# Establish connection testuser2 (user=testuser2)
+connect  testuser2, localhost, testuser2, , db_datadict_2;
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	db_datadict_1	latin1	latin1_swedish_ci	NULL
-NULL	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
 db_datadict_2
-# Establish connection testuser3 (user=testuser3)
+connect  testuser3, localhost, testuser3, , test;
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	db_datadict_1	latin1	latin1_swedish_ci	NULL
-NULL	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
 db_datadict_2
-# Switch to connection default and close connections testuser1,testuser2,testuser3
+connection default;
+disconnect testuser1;
+disconnect testuser2;
+disconnect testuser3;
 DROP USER 'testuser1'@'localhost';
 DROP USER 'testuser2'@'localhost';
 DROP USER 'testuser3'@'localhost';
@@ -123,7 +131,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 CREATE DATABASE db_datadict CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
 SELECT * FROM information_schema.schemata WHERE schema_name = 'db_datadict';
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
-NULL	db_datadict	latin1	latin1_swedish_ci	NULL
+def	db_datadict	latin1	latin1_swedish_ci	NULL
 SELECT schema_name, default_character_set_name
 FROM information_schema.schemata WHERE schema_name = 'db_datadict';
 schema_name	default_character_set_name
@@ -167,9 +175,9 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
 UPDATE information_schema.schemata
 SET default_character_set_name = 'utf8'
 WHERE schema_name = 'db_datadict';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ERROR HY000: The target table schemata of the UPDATE is not updatable
 UPDATE information_schema.schemata SET catalog_name = 't_4711';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ERROR HY000: The target table schemata of the UPDATE is not updatable
 DELETE FROM information_schema.schemata WHERE schema_name = 'db_datadict';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.schemata;

mysql-test/suite/funcs_1/r/is_tables.result

@@ -402,7 +402,7 @@ SELECT * FROM information_schema.tables;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.tables SET table_schema = 'test'
 WHERE table_name = 't1';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.tables WHERE table_name = 't1';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.tables;

mysql-test/suite/funcs_1/r/is_triggers.result

@@ -215,7 +215,7 @@ SELECT * FROM information_schema.triggers;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.triggers SET trigger_schema = 'test'
 WHERE table_name = 't1';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.triggers WHERE trigger_name = 't1';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.triggers;

mysql-test/suite/funcs_1/r/is_views.result

@@ -234,7 +234,7 @@ VALUES ('db2', 'v2');
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.views SET table_schema = 'test'
 WHERE table_name = 't1';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.views WHERE table_name = 't1';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.views;

mysql-test/suite/funcs_1/r/is_views_embedded.result

@@ -28,36 +28,45 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	YES		NULL	
+TABLE_CATALOG	varchar(512)	NO			
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO		NULL	
+VIEW_DEFINITION	longtext	NO			
 CHECK_OPTION	varchar(8)	NO			
 IS_UPDATABLE	varchar(3)	NO			
-DEFINER	varchar(77)	NO			
+DEFINER	varchar(189)	NO			
 SECURITY_TYPE	varchar(7)	NO			
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+ALGORITHM	varchar(10)	NO			
 SHOW CREATE TABLE information_schema.VIEWS;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL default '',
-  `IS_UPDATABLE` varchar(3) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default '',
-  `SECURITY_TYPE` varchar(7) NOT NULL default ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `VIEW_DEFINITION` longtext NOT NULL DEFAULT '',
+  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
+  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
+  `DEFINER` varchar(189) NOT NULL DEFAULT '',
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
+  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
+  `ALGORITHM` varchar(10) NOT NULL DEFAULT ''
+)  DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	YES		NULL	
+TABLE_CATALOG	varchar(512)	NO			
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO		NULL	
+VIEW_DEFINITION	longtext	NO			
 CHECK_OPTION	varchar(8)	NO			
 IS_UPDATABLE	varchar(3)	NO			
-DEFINER	varchar(77)	NO			
+DEFINER	varchar(189)	NO			
 SECURITY_TYPE	varchar(7)	NO			
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+ALGORITHM	varchar(10)	NO			
 SELECT table_catalog, table_schema, table_name
 FROM information_schema.views WHERE table_catalog IS NOT NULL;
 table_catalog	table_schema	table_name
@@ -81,28 +90,31 @@ GRANT SELECT ON db_datadict.v_granted_to_1 TO 'testuser1'@'localhost';
 GRANT SHOW VIEW, CREATE VIEW ON db_datadict.* TO 'testuser2'@'localhost';
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	db_datadict	v_granted_glob	/* ALGORITHM=UNDEFINED */ select `db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER
-NULL	db_datadict	v_granted_to_1	/* ALGORITHM=UNDEFINED */ select `db_datadict`.`t1`.`f1` AS `f1`,`db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER
-# Establish connection testuser1 (user=testuser1)
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
+def	db_datadict	v_granted_glob	select `db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+def	db_datadict	v_granted_to_1	select `db_datadict`.`t1`.`f1` AS `f1`,`db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+connect  testuser1, localhost, testuser1, , test;
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER
-NULL	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER
-# Establish connection testuser2 (user=testuser2)
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
+def	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+def	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+connect  testuser2, localhost, testuser2, , test;
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER
-NULL	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER
-# Establish connection test_no_views (user=test_no_views)
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
+def	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+def	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+connect  test_no_views, localhost, test_no_views, , test;
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER
-NULL	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER
-# Switch to connection default and close all other connections
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
+def	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+def	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+connection default;
+disconnect testuser1;
+disconnect testuser2;
+disconnect test_no_views;
 DROP USER 'testuser1'@'localhost';
 DROP USER 'testuser2'@'localhost';
 DROP USER 'test_no_views'@'localhost';
@@ -120,12 +132,18 @@ DROP   USER 'testuser1'@'localhost';
 CREATE USER 'testuser1'@'localhost';
 SELECT * FROM information_schema.views
 WHERE table_name LIKE 't1_%';
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
 CREATE VIEW test.t1_view AS SELECT DISTINCT f1 FROM test.t1_table;
+CREATE ALGORITHM=MERGE VIEW test.t1_view1 AS SELECT f1 FROM test.t1_table;
+CREATE ALGORITHM=TEMPTABLE VIEW test.t1_view2 AS SELECT f1 FROM test.t1_table;
 SELECT * FROM information_schema.views
 WHERE table_name LIKE 't1_%';
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	test	t1_view	/* ALGORITHM=UNDEFINED */ select distinct `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table`	NONE	NO	root@localhost	DEFINER
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	ALGORITHM
+def	test	t1_view	select distinct `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table`	NONE	NO	root@localhost	DEFINER	latin1	latin1_swedish_ci	UNDEFINED
+def	test	t1_view1	select `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table`	NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci	MERGE
+def	test	t1_view2	select `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table`	NONE	NO	root@localhost	DEFINER	latin1	latin1_swedish_ci	TEMPTABLE
+DROP VIEW test.t1_view1;
+DROP VIEW test.t1_view2;
 SELECT table_name,definer FROM information_schema.views
 WHERE table_name = 't1_view';
 table_name	definer
@@ -148,7 +166,7 @@ ORDER BY table_schema,table_name;
 table_schema	table_name
 test	t1_view
 RENAME TABLE test.t1_view TO db_datadict.t1_view;
-ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed.
+ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed
 DROP VIEW test.t1_view;
 CREATE VIEW db_datadict.t1_view AS SELECT * FROM test.t1_table;
 SELECT table_schema,table_name FROM information_schema.views
@@ -189,8 +207,6 @@ WHERE table_name LIKE 't1_%'
 ORDER BY table_name;
 table_name
 t1_view
-Warnings:
-Warning	1356	View 'db_datadict.t1_view' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 CREATE TABLE test.t1_table (f1 BIGINT, f2 CHAR(10))
 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci COMMENT = 'Initial Comment'
 ENGINE = <engine_type>;
@@ -221,7 +237,7 @@ VALUES ('db2', 'v2');
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 UPDATE information_schema.views SET table_schema = 'test'
 WHERE table_name = 't1';
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+Got one of the listed errors
 DELETE FROM information_schema.views WHERE table_name = 't1';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 TRUNCATE information_schema.views;

mysql-test/suite/funcs_1/t/is_character_sets.test

@@ -9,11 +9,6 @@
 #                   Create this script based on older scripts and new code.
 #
 
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
-
 let $is_table = CHARACTER_SETS;
 
 # The table INFORMATION_SCHEMA.CHARACTER_SETS must exist
@@ -82,7 +77,7 @@ CREATE DATABASE db_datadict;
 INSERT INTO information_schema.character_sets
 SELECT * FROM information_schema.character_sets;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.character_sets SET description = 'just updated';
 
 --error ER_DBACCESS_DENIED_ERROR

mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test

@@ -9,11 +9,6 @@
 #                   Create this script based on older scripts and new code.
 #
 
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
-
 let $is_table = COLLATION_CHARACTER_SET_APPLICABILITY;
 
 # The table INFORMATION_SCHEMA.CHARACTER_SET_APPLICABILITY must exist
@@ -79,10 +74,10 @@ CREATE DATABASE db_datadict;
 INSERT INTO information_schema.collation_character_set_applicability
 SELECT * FROM information_schema.collation_character_set_applicability;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.collation_character_set_applicability
 SET collation_name = 'big6_chinese_ci' WHERE character_set_name = 'big6';
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.collation_character_set_applicability
 SET character_set_name = 't_4711';
 

mysql-test/suite/funcs_1/t/is_collations.test

@@ -9,10 +9,6 @@
 #                   Create this script based on older scripts and new code.
 #
 
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
 let $is_table = COLLATIONS;
 
 # The table INFORMATION_SCHEMA.COLLATIONS must exist
@@ -86,7 +82,7 @@ INSERT INTO information_schema.collations
        (collation_name,character_set_name,id,is_default,is_compiled,sortlen)
 VALUES (  'cp1251_bin',          'cp1251',50,        '',         '',0);
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.collations SET description = 'just updated';
 
 --error ER_DBACCESS_DENIED_ERROR

mysql-test/suite/funcs_1/t/is_engines.test

@@ -15,11 +15,6 @@
 #                           testsuite funcs_1
 #
 
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
-
 let $engine_type       = MEMORY;
 let $other_engine_type = MyISAM;
 
@@ -100,7 +95,7 @@ ENGINE = $engine_type;
 INSERT INTO information_schema.engines
 SELECT * FROM information_schema.engines;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.engines SET engine = '1234567';
 
 --error ER_DBACCESS_DENIED_ERROR

mysql-test/suite/funcs_1/t/is_events.test

@@ -10,11 +10,6 @@
 #                           testsuite funcs_1
 #
 
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
-
 let $engine_type       = MEMORY;
 let $other_engine_type = MyISAM;
 
@@ -143,7 +138,7 @@ ENGINE = $engine_type;
 INSERT INTO information_schema.events
 SELECT * FROM information_schema.events;
 
---error ER_DBACCESS_DENIED_ERROR
+--error ER_DBACCESS_DENIED_ERROR,ER_NON_UPDATABLE_TABLE
 UPDATE information_schema.events SET event_name = '1234567'
 WHERE table_name = 't1';
 

mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test

@@ -18,8 +18,4 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
 --source suite/funcs_1/datadict/is_key_column_usage.inc

mysql-test/suite/funcs_1/t/is_routines_embedded.test

@@ -17,8 +17,4 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
 --source suite/funcs_1/datadict/is_routines.inc

mysql-test/suite/funcs_1/t/is_schemata_embedded.test

@@ -17,8 +17,4 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
 --source suite/funcs_1/datadict/is_schemata.inc

mysql-test/suite/funcs_1/t/is_tables_embedded.test

@@ -17,8 +17,4 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
 --source suite/funcs_1/datadict/is_tables.inc

mysql-test/suite/funcs_1/t/is_triggers_embedded.test

@@ -17,8 +17,4 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
 --source suite/funcs_1/datadict/is_triggers.inc

mysql-test/suite/funcs_1/t/is_views_embedded.test

@@ -17,8 +17,4 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-if (`SELECT VERSION() LIKE '%embedded%'`)
-{
-   --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
-}
 --source suite/funcs_1/datadict/is_views.inc