Fix for Bug#42836 Funcs_1 storedproc and storedproc_08 tests failing

1 files changed, 3 insertions, 210 deletions

diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
index 2740a2cafa8..7f08a77ef09 100644
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
@@ -104,7 +104,7 @@ END//
 
 ... now check what is stored:
 -----------------------------
-SELECT * FROM information_schema.routines;
+SELECT * FROM information_schema.routines where routine_schema = 'db_storedproc';
 SPECIFIC_NAME	fn_1
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -209,75 +209,6 @@ DEFINER	root@localhost
 CHARACTER_SET_CLIENT	latin1
 COLLATION_CONNECTION	latin1_swedish_ci
 DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	add_suppression
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	add_suppression
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN   INSERT INTO test_suppressions (pattern) VALUES (pattern); END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	check_testcase
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	check_testcase
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN    SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES     WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME;    SELECT * FROM INFORMATION_SCHEMA.SCHEMATA;    SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES     WHERE table_schema='test';    SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql     FROM INFORMATION_SCHEMA.TABLES       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'         ORDER BY tables_in_mysql;   SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql,   	 column_name, ordinal_position, column_default, is_nullable,          data_type, character_maximum_length, character_octet_length,          numeric_precision, numeric_scale, character_set_name,          collation_name, column_type, column_key, extra, column_comment     FROM INFORMATION_SCHEMA.COLUMNS       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'         ORDER BY columns_in_mysql;    checksum table     mysql.columns_priv,     mysql.db,     mysql.func,     mysql.help_category,     mysql.help_keyword,     mysql.help_relation,     mysql.host,     mysql.proc,     mysql.procs_priv,     mysql.tables_priv,     mysql.time_zone,     mysql.time_zone_leap_second,     mysql.time_zone_name,     mysql.time_zone_transition,     mysql.time_zone_transition_type,     mysql.user;  END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	check_warnings
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	check_warnings
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN   DECLARE `pos` bigint unsigned;    SET SQL_LOG_BIN=0;    UPDATE error_log el, global_suppressions gs     SET suspicious=0       WHERE el.suspicious=1 AND el.line REGEXP gs.pattern;    UPDATE error_log el, test_suppressions ts     SET suspicious=0       WHERE el.suspicious=1 AND el.line REGEXP ts.pattern;    SELECT COUNT(*) INTO @num_warnings FROM error_log     WHERE suspicious=1;    IF @num_warnings > 0 THEN     SELECT file_name, line         FROM error_log WHERE suspicious=1;     SELECT 2 INTO result;   ELSE     SELECT 0 INTO RESULT;   END IF;    TRUNCATE test_suppressions;   DROP TABLE error_log;  END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_1;
 Function	fn_1
 sql_mode	NO_ENGINE_SUBSTITUTION
@@ -391,7 +322,7 @@ ALTER FUNCTION  fn_2 MODIFIES SQL DATA;
 
 ... now check what is stored:
 -----------------------------
-SELECT * FROM information_schema.routines;
+SELECT * FROM information_schema.routines where routine_schema = 'db_storedproc';
 SPECIFIC_NAME	fn_1
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -496,75 +427,6 @@ DEFINER	root@localhost
 CHARACTER_SET_CLIENT	latin1
 COLLATION_CONNECTION	latin1_swedish_ci
 DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	add_suppression
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	add_suppression
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN   INSERT INTO test_suppressions (pattern) VALUES (pattern); END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	check_testcase
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	check_testcase
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN    SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES     WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME;    SELECT * FROM INFORMATION_SCHEMA.SCHEMATA;    SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES     WHERE table_schema='test';    SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql     FROM INFORMATION_SCHEMA.TABLES       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'         ORDER BY tables_in_mysql;   SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql,   	 column_name, ordinal_position, column_default, is_nullable,          data_type, character_maximum_length, character_octet_length,          numeric_precision, numeric_scale, character_set_name,          collation_name, column_type, column_key, extra, column_comment     FROM INFORMATION_SCHEMA.COLUMNS       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'         ORDER BY columns_in_mysql;    checksum table     mysql.columns_priv,     mysql.db,     mysql.func,     mysql.help_category,     mysql.help_keyword,     mysql.help_relation,     mysql.host,     mysql.proc,     mysql.procs_priv,     mysql.tables_priv,     mysql.time_zone,     mysql.time_zone_leap_second,     mysql.time_zone_name,     mysql.time_zone_transition,     mysql.time_zone_transition_type,     mysql.user;  END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	check_warnings
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	check_warnings
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN   DECLARE `pos` bigint unsigned;    SET SQL_LOG_BIN=0;    UPDATE error_log el, global_suppressions gs     SET suspicious=0       WHERE el.suspicious=1 AND el.line REGEXP gs.pattern;    UPDATE error_log el, test_suppressions ts     SET suspicious=0       WHERE el.suspicious=1 AND el.line REGEXP ts.pattern;    SELECT COUNT(*) INTO @num_warnings FROM error_log     WHERE suspicious=1;    IF @num_warnings > 0 THEN     SELECT file_name, line         FROM error_log WHERE suspicious=1;     SELECT 2 INTO result;   ELSE     SELECT 0 INTO RESULT;   END IF;    TRUNCATE test_suppressions;   DROP TABLE error_log;  END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_1;
 Function	fn_1
 sql_mode	NO_ENGINE_SUBSTITUTION
@@ -671,7 +533,7 @@ ALTER FUNCTION  fn_2 CONTAINS SQL;
 
 ... now check what is stored:
 -----------------------------
-SELECT * FROM information_schema.routines;
+SELECT * FROM information_schema.routines where routine_schema = 'db_storedproc';
 SPECIFIC_NAME	fn_1
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_storedproc
@@ -776,75 +638,6 @@ DEFINER	root@localhost
 CHARACTER_SET_CLIENT	latin1
 COLLATION_CONNECTION	latin1_swedish_ci
 DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	add_suppression
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	add_suppression
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN   INSERT INTO test_suppressions (pattern) VALUES (pattern); END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	check_testcase
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	check_testcase
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN    SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES     WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME;    SELECT * FROM INFORMATION_SCHEMA.SCHEMATA;    SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES     WHERE table_schema='test';    SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql     FROM INFORMATION_SCHEMA.TABLES       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'         ORDER BY tables_in_mysql;   SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql,   	 column_name, ordinal_position, column_default, is_nullable,          data_type, character_maximum_length, character_octet_length,          numeric_precision, numeric_scale, character_set_name,          collation_name, column_type, column_key, extra, column_comment     FROM INFORMATION_SCHEMA.COLUMNS       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'         ORDER BY columns_in_mysql;    checksum table     mysql.columns_priv,     mysql.db,     mysql.func,     mysql.help_category,     mysql.help_keyword,     mysql.help_relation,     mysql.host,     mysql.proc,     mysql.procs_priv,     mysql.tables_priv,     mysql.time_zone,     mysql.time_zone_leap_second,     mysql.time_zone_name,     mysql.time_zone_transition,     mysql.time_zone_transition_type,     mysql.user;  END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
-SPECIFIC_NAME	check_warnings
-ROUTINE_CATALOG	NULL
-ROUTINE_SCHEMA	mtr
-ROUTINE_NAME	check_warnings
-ROUTINE_TYPE	PROCEDURE
-DTD_IDENTIFIER	NULL
-ROUTINE_BODY	SQL
-ROUTINE_DEFINITION	BEGIN   DECLARE `pos` bigint unsigned;    SET SQL_LOG_BIN=0;    UPDATE error_log el, global_suppressions gs     SET suspicious=0       WHERE el.suspicious=1 AND el.line REGEXP gs.pattern;    UPDATE error_log el, test_suppressions ts     SET suspicious=0       WHERE el.suspicious=1 AND el.line REGEXP ts.pattern;    SELECT COUNT(*) INTO @num_warnings FROM error_log     WHERE suspicious=1;    IF @num_warnings > 0 THEN     SELECT file_name, line         FROM error_log WHERE suspicious=1;     SELECT 2 INTO result;   ELSE     SELECT 0 INTO RESULT;   END IF;    TRUNCATE test_suppressions;   DROP TABLE error_log;  END
-EXTERNAL_NAME	NULL
-EXTERNAL_LANGUAGE	NULL
-PARAMETER_STYLE	SQL
-IS_DETERMINISTIC	NO
-SQL_DATA_ACCESS	CONTAINS SQL
-SQL_PATH	NULL
-SECURITY_TYPE	DEFINER
-CREATED	<modified>
-LAST_ALTERED	<created>
-SQL_MODE	
-ROUTINE_COMMENT	
-DEFINER	root@localhost
-CHARACTER_SET_CLIENT	latin1
-COLLATION_CONNECTION	latin1_swedish_ci
-DATABASE_COLLATION	latin1_swedish_ci
 SHOW CREATE FUNCTION  fn_1;
 Function	fn_1
 sql_mode	NO_ENGINE_SUBSTITUTION