Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

mysql-test/r/ps_1general.result

@@ -444,7 +444,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	14	N	1	31	8
@@ -460,7 +460,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	5	Y	0	31	8
 def					possible_keys	253	4096	7	Y	0	31	8
 def					key	253	64	7	Y	0	31	8
-def					key_len	253	4096	1	Y	128	31	63
+def					key_len	253	1365	1	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	27	N	1	31	8

mysql-test/r/ps_2myisam.result

@@ -1158,7 +1158,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8

mysql-test/r/ps_3innodb.result

@@ -1158,7 +1158,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8

mysql-test/r/ps_4heap.result

@@ -1159,7 +1159,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8

mysql-test/r/ps_5merge.result

@@ -1201,7 +1201,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8
@@ -4222,7 +4222,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8

mysql-test/r/ps_7ndb.result

@@ -1158,7 +1158,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	128	31	63
+def					key_len	253	1365	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8

mysql-test/r/show_check.result

@@ -7,60 +7,157 @@ delete from mysql.db where user='mysqltest_1' || user='mysqltest_2' || user='mys
 flush privileges;
 create table t1 (a int not null primary key, b int not null,c int not null, key(b,c));
 insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4);
+-- Here we enable metadata just to check that the collation of the
+-- resultset is non-binary for string type. This should be changed
+-- after Bug#29394 is implemented.
 check table t1 fast;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	5	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	27	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	Table is already up to date
 check table t1 fast;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	5	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	27	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	Table is already up to date
 check table t1 changed;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	5	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	2	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 insert into t1 values (5,5,5);
 check table t1 changed;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	5	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	2	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 check table t1 medium;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	5	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	2	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 check table t1 extended;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	5	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	2	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 show index from t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def			STATISTICS	TABLE_NAME	Table	253	64	2	N	1	0	8
+def			STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	32769	0	63
+def			STATISTICS	INDEX_NAME	Key_name	253	64	7	N	1	0	8
+def			STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	32769	0	63
+def			STATISTICS	COLUMN_NAME	Column_name	253	64	1	N	1	0	8
+def			STATISTICS	COLLATION	Collation	253	1	1	Y	0	0	8
+def			STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	32768	0	63
+def			STATISTICS	SUB_PART	Sub_part	8	3	0	Y	32768	0	63
+def			STATISTICS	PACKED	Packed	253	10	0	Y	0	0	8
+def			STATISTICS	NULLABLE	Null	253	3	0	N	1	0	8
+def			STATISTICS	INDEX_TYPE	Index_type	253	16	5	N	1	0	8
+def			STATISTICS	COMMENT	Comment	253	16	0	Y	0	0	8
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	a	A	5	NULL	NULL		BTREE	
 t1	1	b	1	b	A	1	NULL	NULL		BTREE	
 t1	1	b	2	c	A	5	NULL	NULL		BTREE	
 insert into t1 values (5,5,5);
 ERROR 23000: Duplicate entry '5' for key 'PRIMARY'
+-- Here we enable metadata just to check that the collation of the
+-- resultset is non-binary for string type. This should be changed
+-- after Bug#29394 is implemented.
 optimize table t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	8	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	2	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 optimize table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	Table is already up to date
 drop table t1;
+-- Here we enable metadata just to check that the collation of the
+-- resultset is non-binary for string type. This should be changed
+-- after Bug#29394 is implemented.
 show variables like "wait_timeout%";
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def			VARIABLES	Variable_name	Variable_name	253	80	12	N	1	0	8
+def			VARIABLES	Value	Value	253	512	5	N	1	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "WAIT_timeout%";
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def			VARIABLES	Variable_name	Variable_name	253	80	12	N	1	0	8
+def			VARIABLES	Value	Value	253	512	5	N	1	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "this_doesn't_exists%";
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def			VARIABLES	Variable_name	Variable_name	253	80	0	N	1	0	8
+def			VARIABLES	Value	Value	253	512	0	N	1	0	8
 Variable_name	Value
 show table status from test like "this_doesn't_exists%";
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def			TABLES	TABLE_NAME	Name	253	64	0	N	1	0	8
+def			TABLES	ENGINE	Engine	253	64	0	Y	0	0	8
+def			TABLES	VERSION	Version	8	21	0	Y	32768	0	63
+def			TABLES	ROW_FORMAT	Row_format	253	10	0	Y	0	0	8
+def			TABLES	TABLE_ROWS	Rows	8	21	0	Y	32768	0	63
+def			TABLES	AVG_ROW_LENGTH	Avg_row_length	8	21	0	Y	32768	0	63
+def			TABLES	DATA_LENGTH	Data_length	8	21	0	Y	32768	0	63
+def			TABLES	MAX_DATA_LENGTH	Max_data_length	8	21	0	Y	32768	0	63
+def			TABLES	INDEX_LENGTH	Index_length	8	21	0	Y	32768	0	63
+def			TABLES	DATA_FREE	Data_free	8	21	0	Y	32768	0	63
+def			TABLES	AUTO_INCREMENT	Auto_increment	8	21	0	Y	32768	0	63
+def			TABLES	CREATE_TIME	Create_time	12	19	0	Y	128	0	63
+def			TABLES	UPDATE_TIME	Update_time	12	19	0	Y	128	0	63
+def			TABLES	CHECK_TIME	Check_time	12	19	0	Y	128	0	63
+def			TABLES	TABLE_COLLATION	Collation	253	64	0	Y	0	0	8
+def			TABLES	CHECKSUM	Checksum	8	21	0	Y	32768	0	63
+def			TABLES	CREATE_OPTIONS	Create_options	253	255	0	Y	0	0	8
+def			TABLES	TABLE_COMMENT	Comment	253	80	0	N	1	0	8
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
 show databases;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def			SCHEMATA	SCHEMA_NAME	Database	253	64	18	N	1	0	8
 Database
 information_schema
 mysql
 test
 show databases like "test%";
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def			SCHEMATA	SCHEMA_NAME	Database (test%)	253	64	4	N	1	0	8
 Database (test%)
 test
 create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4));
 insert into t1 values (1,1,1,0),(1,1,2,0),(1,1,3,0),(1,2,1,0),(1,2,2,0),(1,2,3,0),(1,3,1,0),(1,3,2,0),(1,3,3,0),(1,1,1,1),(1,1,2,1),(1,1,3,1),(1,2,1,1),(1,2,2,1),(1,2,3,1),(1,3,1,1),(1,3,2,1),(1,3,3,1);
+-- Here we enable metadata just to check that the collation of the
+-- resultset is non-binary for string type. This should be changed
+-- after Bug#29394 is implemented.
 analyze table t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	7	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	2	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 show index from t1;
@@ -69,7 +166,15 @@ t1	0	PRIMARY	1	f1	A	1	NULL	NULL		BTREE
 t1	0	PRIMARY	2	f2	A	3	NULL	NULL		BTREE	
 t1	0	PRIMARY	3	f3	A	9	NULL	NULL		BTREE	
 t1	0	PRIMARY	4	f4	A	18	NULL	NULL		BTREE	
+-- Here we enable metadata just to check that the collation of the
+-- resultset is non-binary for string type. This should be changed
+-- after Bug#29394 is implemented.
 repair table t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	42	7	Y	0	31	8
+def					Op	253	3	6	Y	0	31	8
+def					Msg_type	253	3	6	Y	0	31	8
+def					Msg_text	253	85	2	Y	0	31	8
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 show index from t1;

mysql-test/t/show_check.test

@@ -22,6 +22,12 @@ flush privileges;
 
 create table t1 (a int not null primary key, b int not null,c int not null, key(b,c));
 insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4);
+
+--echo -- Here we enable metadata just to check that the collation of the
+--echo -- resultset is non-binary for string type. This should be changed
+--echo -- after Bug#29394 is implemented.
+
+--enable_metadata
 check table t1 fast;
 check table t1 fast;
 check table t1 changed;
@@ -30,28 +36,58 @@ check table t1 changed;
 check table t1 medium;
 check table t1 extended;
 show index from t1;
+--disable_metadata
 --error ER_DUP_ENTRY
 insert into t1 values (5,5,5);
+
+--echo -- Here we enable metadata just to check that the collation of the
+--echo -- resultset is non-binary for string type. This should be changed
+--echo -- after Bug#29394 is implemented.
+
+--enable_metadata
 optimize table t1;
+--disable_metadata
 optimize table t1;
 drop table t1;
 
 #show variables;
+
+--echo -- Here we enable metadata just to check that the collation of the
+--echo -- resultset is non-binary for string type. This should be changed
+--echo -- after Bug#29394 is implemented.
+
+--enable_metadata
 show variables like "wait_timeout%";
 show variables like "WAIT_timeout%";
 show variables like "this_doesn't_exists%";
 show table status from test like "this_doesn't_exists%";
 show databases;
 show databases like "test%";
+--disable_metadata
 
 #
 # Check of show index
 #
 create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4));
 insert into t1 values (1,1,1,0),(1,1,2,0),(1,1,3,0),(1,2,1,0),(1,2,2,0),(1,2,3,0),(1,3,1,0),(1,3,2,0),(1,3,3,0),(1,1,1,1),(1,1,2,1),(1,1,3,1),(1,2,1,1),(1,2,2,1),(1,2,3,1),(1,3,1,1),(1,3,2,1),(1,3,3,1);
+
+--echo -- Here we enable metadata just to check that the collation of the
+--echo -- resultset is non-binary for string type. This should be changed
+--echo -- after Bug#29394 is implemented.
+
+--enable_metadata
 analyze table t1;
+--disable_metadata
 show index from t1;
+
+--echo -- Here we enable metadata just to check that the collation of the
+--echo -- resultset is non-binary for string type. This should be changed
+--echo -- after Bug#29394 is implemented.
+
+--enable_metadata
+
 repair table t1;
+--disable_metadata
 show index from t1;
 drop table t1;
 
@@ -513,6 +549,217 @@ show status like 'slow_queries';
 # (mysqld is started with --log-queries-not-using-indexes)
 select 1 from information_schema.tables limit 1;
 show status like 'slow_queries';
+#
+# BUG#10491: Server returns data as charset binary SHOW CREATE TABLE or SELECT
+# FROM I_S.
+#
+
+# Ensure that all needed objects are dropped.
+
+--disable_warnings
+DROP DATABASE IF EXISTS mysqltest1;
+DROP TABLE IF EXISTS t1;
+DROP VIEW IF EXISTS v1;
+DROP PROCEDURE IF EXISTS p1;
+DROP FUNCTION IF EXISTS f1;
+--enable_warnings
+
+# Create objects.
+
+CREATE DATABASE mysqltest1;
+
+CREATE TABLE t1(c INT NOT NULL PRIMARY KEY);
+
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a = 1;
+
+CREATE VIEW v1 AS SELECT 1;
+
+CREATE PROCEDURE p1() SELECT 1;
+
+CREATE FUNCTION f1() RETURNS INT RETURN 1;
+
+
+# Test.
+
+set names utf8;
+
+--echo -- Here we enable metadata just to check that the collation of the
+--echo -- resultset is non-binary for string type. This should be changed
+--echo -- after Bug#29394 is implemented.
+
+--enable_metadata
+
+--echo ----------------------------------------------------------------
+
+SHOW CHARACTER SET LIKE 'utf8';
+
+--echo ----------------------------------------------------------------
+
+SHOW COLLATION LIKE 'latin1_bin';
+
+--echo ----------------------------------------------------------------
+
+SHOW CREATE DATABASE mysqltest1;
+
+--echo ----------------------------------------------------------------
+
+SHOW DATABASES LIKE 'mysqltest1';
+
+--echo ----------------------------------------------------------------
+
+SHOW CREATE TABLE t1;
+
+--echo ----------------------------------------------------------------
+
+SHOW INDEX FROM t1;
+
+--echo ----------------------------------------------------------------
+
+SELECT
+  TABLE_CATALOG,
+  TABLE_SCHEMA,
+  TABLE_NAME,
+  TABLE_TYPE,
+  ENGINE,
+  ROW_FORMAT,
+  TABLE_COLLATION,
+  CREATE_OPTIONS,
+  TABLE_COMMENT
+FROM INFORMATION_SCHEMA.TABLES
+WHERE table_name = 't1';
+
+--echo ----------------------------------------------------------------
+
+SELECT
+  TABLE_CATALOG,
+  TABLE_SCHEMA,
+  TABLE_NAME,
+  COLUMN_NAME,
+  COLUMN_DEFAULT,
+  IS_NULLABLE,
+  DATA_TYPE,
+  CHARACTER_SET_NAME,
+  COLLATION_NAME,
+  COLUMN_TYPE,
+  COLUMN_KEY,
+  EXTRA,
+  PRIVILEGES,
+  COLUMN_COMMENT
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE table_name = 't1';
+
+--echo ----------------------------------------------------------------
+
+SHOW TABLES LIKE 't1';
+
+--echo ----------------------------------------------------------------
+
+SHOW COLUMNS FROM t1;
+
+--echo ----------------------------------------------------------------
+
+SHOW TRIGGERS LIKE 't1';
+
+--echo ----------------------------------------------------------------
+
+SELECT 
+  TRIGGER_CATALOG,
+  TRIGGER_SCHEMA,
+  TRIGGER_NAME,
+  EVENT_MANIPULATION,
+  EVENT_OBJECT_CATALOG,
+  EVENT_OBJECT_SCHEMA,
+  EVENT_OBJECT_TABLE,
+  ACTION_CONDITION,
+  ACTION_STATEMENT,
+  ACTION_ORIENTATION,
+  ACTION_TIMING,
+  ACTION_REFERENCE_OLD_TABLE,
+  ACTION_REFERENCE_NEW_TABLE,
+  ACTION_REFERENCE_OLD_ROW,
+  ACTION_REFERENCE_NEW_ROW,
+  SQL_MODE,
+  DEFINER
+FROM INFORMATION_SCHEMA.TRIGGERS
+WHERE trigger_name = 't1_bi';
+
+--echo ----------------------------------------------------------------
+
+SHOW CREATE VIEW v1;
+
+--echo ----------------------------------------------------------------
+
+SELECT *
+FROM INFORMATION_SCHEMA.VIEWS
+WHERE table_name = 'v1';
+
+--echo ----------------------------------------------------------------
+
+SHOW CREATE PROCEDURE p1;
+
+--echo ----------------------------------------------------------------
+
+SELECT
+  SPECIFIC_NAME,
+  ROUTINE_CATALOG,
+  ROUTINE_SCHEMA,
+  ROUTINE_NAME,
+  ROUTINE_TYPE,
+  DTD_IDENTIFIER,
+  ROUTINE_BODY,
+  ROUTINE_DEFINITION,
+  EXTERNAL_NAME,
+  EXTERNAL_LANGUAGE,
+  PARAMETER_STYLE,
+  IS_DETERMINISTIC,
+  SQL_DATA_ACCESS,
+  SQL_PATH,
+  SECURITY_TYPE,
+  SQL_MODE,
+  ROUTINE_COMMENT,
+  DEFINER
+FROM INFORMATION_SCHEMA.ROUTINES
+WHERE routine_name = 'p1';
+
+--echo ----------------------------------------------------------------
+
+SHOW CREATE FUNCTION f1;
+
+--echo ----------------------------------------------------------------
+
+SELECT
+  SPECIFIC_NAME,
+  ROUTINE_CATALOG,
+  ROUTINE_SCHEMA,
+  ROUTINE_NAME,
+  ROUTINE_TYPE,
+  DTD_IDENTIFIER,
+  ROUTINE_BODY,
+  ROUTINE_DEFINITION,
+  EXTERNAL_NAME,
+  EXTERNAL_LANGUAGE,
+  PARAMETER_STYLE,
+  IS_DETERMINISTIC,
+  SQL_DATA_ACCESS,
+  SQL_PATH,
+  SECURITY_TYPE,
+  SQL_MODE,
+  ROUTINE_COMMENT,
+  DEFINER
+FROM INFORMATION_SCHEMA.ROUTINES
+WHERE routine_name = 'f1';
+
+--echo ----------------------------------------------------------------
+
+--disable_metadata
+
+# Cleanup.
+
+DROP DATABASE mysqltest1;
+DROP TABLE t1;
+DROP VIEW v1;
+DROP PROCEDURE p1;
+DROP FUNCTION f1;
 
 --echo End of 5.0 tests.
 

sql/handler.cc

@@ -1453,7 +1453,7 @@ int ha_delete_table(THD *thd, handlerton *table_type, const char *path,
 
     strmake(buff, thd->net.last_error, sizeof(buff)-1);
     thd->query_error= 0;
-    thd->spcont= 0;
+    thd->spcont= NULL;
     thd->lex->current_select= 0;
     thd->net.last_error[0]= 0;
 

sql/item.h

@@ -1888,11 +1888,17 @@ class Item_blob :public Item_partition_func_safe_string
 };
 
 
+/**
+  Item_empty_string -- is a utility class to put an item into List<Item>
+  which is then used in protocol.send_fields() when sending SHOW output to
+  the client.
+*/
+
 class Item_empty_string :public Item_partition_func_safe_string
 {
 public:
   Item_empty_string(const char *header,uint length, CHARSET_INFO *cs= NULL) :
-    Item_partition_func_safe_string("",0, cs ? cs : &my_charset_bin)
+    Item_partition_func_safe_string("",0, cs ? cs : &my_charset_utf8_general_ci)
     { name=(char*) header; max_length= cs ? length * cs->mbmaxlen : length; }
   void make_field(Send_field *field);
 };

sql/sp_head.cc

@@ -2734,7 +2734,7 @@ sp_instr_set::exec_core(THD *thd, uint *nextp)
 
       sp_rcontext *spcont= thd->spcont;
     
-      thd->spcont= 0;           /* Avoid handlers */
+      thd->spcont= NULL;           /* Avoid handlers */
       my_error(ER_OUT_OF_RESOURCES, MYF(0));
       spcont->clear_handler();
       thd->spcont= spcont;
@@ -3469,7 +3469,7 @@ sp_instr_set_case_expr::exec_core(THD *thd, uint *nextp)
 
       sp_rcontext *spcont= thd->spcont;
     
-      thd->spcont= 0;           /* Avoid handlers */
+      thd->spcont= NULL;           /* Avoid handlers */
       my_error(ER_OUT_OF_RESOURCES, MYF(0));
       spcont->clear_handler();
       thd->spcont= spcont;

sql/sql_error.cc

@@ -126,7 +126,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
     sp_rcontext *spcont= thd->spcont;
 
     thd->no_warnings_for_error= 1;
-    thd->spcont= 0;
+    thd->spcont= NULL;
 
     thd->killed= THD::KILL_BAD_DATA;
     my_message(code, msg, MYF(0));

tests/mysql_client_test.c

@@ -7836,7 +7836,7 @@ static void test_explain_bug()
   else
   {
     verify_prepare_field(result, 6, "key_len", "", MYSQL_TYPE_VAR_STRING, "", 
-                         "", "", NAME_CHAR_LEN*MAX_KEY, 0);
+                         "", "", NAME_CHAR_LEN*MAX_KEY/ my_charset_utf8_general_ci.mbmaxlen, 0);
   }
 
   verify_prepare_field(result, 7, "ref", "", MYSQL_TYPE_VAR_STRING,