bk commit into 5.0 tree (gluh:1.1968) BUG#14476

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1968 05/11/11 15:41:06 gluh@stripped +3 -0
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
   store TABLES.TABLE_TYPE in case of error during table opening

  sql/sql_show.cc
    1.297 05/11/11 15:39:47 gluh@stripped +4 -0
    Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
     store TABLES.TABLE_TYPE in case of error during table opening

  mysql-test/t/information_schema.test
    1.63 05/11/11 15:39:47 gluh@stripped +10 -0
    Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
     test case

  mysql-test/r/information_schema.result
    1.90 05/11/11 15:39:47 gluh@stripped +7 -0
    Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
      test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.0.14476

--- 1.296/sql/sql_show.cc	Fri Nov 11 13:38:29 2005
+++ 1.297/sql/sql_show.cc	Fri Nov 11 15:39:47 2005
@@ -2309,6 +2309,10 @@
       there was errors during opening tables
     */
     const char *error= thd->net.last_error;
+    if (tables->view)
+      table->field[3]->store("VIEW", 4, cs);
+    else
+      table->field[3]->store("BASE TABLE", 10, cs);
     table->field[20]->store(error, strlen(error), cs);
     thd->clear_error();
   }

--- 1.89/mysql-test/r/information_schema.result	Fri Nov 11 13:38:29 2005
+++ 1.90/mysql-test/r/information_schema.result	Fri Nov 11 15:39:47 2005
@@ -1048,3 +1048,10 @@
 text	65535	65535
 text	65535	32767
 drop table t1;
+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="t1";
+table_type
+drop view v1;

--- 1.62/mysql-test/t/information_schema.test	Fri Nov 11 13:38:29 2005
+++ 1.63/mysql-test/t/information_schema.test	Fri Nov 11 15:39:47 2005
@@ -738,3 +738,13 @@
 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="t1";
+drop view v1;