bk commit into 5.0 tree (gluh:1.1991) BUG#15224

[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.1991 05/12/19 14:46:54 gluh@stripped +3 -0
  Bug#12770 DESC cannot display the info. about temporary table
  Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
  Bug#15224 SHOW INDEX from temporary table doesn't work.
    Restore thd->temporary_tables to be able to process
    temporary tables(only for 'show index' & 'show columns').
    This should be changed when processing of temporary tables for
    I_S tables will be done.

  sql/sql_show.cc
    1.301 05/12/19 14:46:49 gluh@stripped +8 -0
    Bug#12770 DESC cannot display the info. about temporary table
    Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
    Bug#15224 SHOW INDEX from temporary table doesn't work.
      Restore thd->temporary_tables to be able to process
      temporary tables(only for 'show index' & 'show columns').
      This should be changed when processing of temporary tables for
      I_S tables will be done.

  mysql-test/t/information_schema.test
    1.64 05/12/19 14:46:49 gluh@stripped +11 -0
    Bug#12770 DESC cannot display the info. about temporary table
    Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
    Bug#15224 SHOW INDEX from temporary table doesn't work.
      test case

  mysql-test/r/information_schema.result
    1.91 05/12/19 14:46:48 gluh@stripped +11 -0
    Bug#12770 DESC cannot display the info. about temporary table
    Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
    Bug#15224 SHOW INDEX from temporary table doesn't work.
      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/Merge/5.0

--- 1.300/sql/sql_show.cc	Thu Dec  1 10:59:16 2005
+++ 1.301/sql/sql_show.cc	Mon Dec 19 14:46:49 2005
@@ -2069,6 +2069,13 @@ int get_all_tables(THD *thd, TABLE_LIST 
     bool res;
 
     lex->all_selects_list= lsel;
+    /*
+      Restore thd->temporary_tables to be able to process
+      temporary tables(only for 'show index' & 'show columns').
+      This should be changed when processing of temporary tables for
+      I_S tables will be done.
+    */
+    thd->temporary_tables= open_tables_state_backup.temporary_tables;
     res= open_normal_and_derived_tables(thd, show_table_list,
                                         MYSQL_LOCK_IGNORE_FLUSH);
     /*
@@ -2088,6 +2095,7 @@ int get_all_tables(THD *thd, TABLE_LIST 
                                              show_table_list->view_db.str :
                                              show_table_list->db),
                                             show_table_list->alias));
+    thd->temporary_tables= 0;
     close_thread_tables(thd);
     show_table_list->table= 0;
     goto err;

--- 1.90/mysql-test/r/information_schema.result	Thu Dec  1 10:59:16 2005
+++ 1.91/mysql-test/r/information_schema.result	Mon Dec 19 14:46:48 2005
@@ -1056,3 +1056,14 @@ where table_name="v1";
 table_type
 VIEW
 drop view v1;
+create temporary table t1(f1 int, index(f1));
+show columns from t1;
+Field	Type	Null	Key	Default	Extra
+f1	int(11)	YES	MUL	NULL	
+describe t1;
+Field	Type	Null	Key	Default	Extra
+f1	int(11)	YES	MUL	NULL	
+show indexes from t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
+t1	1	f1	1	f1	A	NULL	NULL	NULL	YES	BTREE	
+drop table t1;

--- 1.63/mysql-test/t/information_schema.test	Thu Dec  1 10:59:16 2005
+++ 1.64/mysql-test/t/information_schema.test	Mon Dec 19 14:46:49 2005
@@ -748,3 +748,14 @@ drop table t1;
 select table_type from information_schema.tables
 where table_name="v1";
 drop view v1;
+
+#
+# Bug #14387 SHOW COLUMNS doesn't work on temporary tables
+# Bug #15224 SHOW INDEX from temporary table doesn't work
+# Bug #12770 DESC cannot display the info. about temporary table
+#
+create temporary table t1(f1 int, index(f1));
+show columns from t1;
+describe t1;
+show indexes from t1;
+drop table t1;