Merge mysql.com:/home/gluh/MySQL/Merge/5.0

into mysql.com:/home/gluh/MySQL/Merge/5.1-new


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

1 files changed, 10 insertions, 0 deletions

diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 1cd55926e80..acbc62f1364 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -738,3 +738,13 @@ create table t1(a blob, b text charset utf8, c text charset ucs2);
 select data_type, character_octet_length, character_maximum_length 
   from information_schema.columns where table_name='t1';
 drop table t1;
+
+#
+# Bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
+#
+create table t1 (f1 int(11));
+create view v1 as select * from t1;
+drop table t1;
+select table_type from information_schema.tables
+where table_name="v1";
+drop view v1;