bk commit into 5.0 tree (jimw:1.1927) BUG#12770

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1927 05/08/25 16:34:43 jimw@stripped +3 -0
  Allow DESCRIBE to work with temporary tables. (Bug #12770)

  sql/sql_show.cc
    1.275 05/08/25 16:34:39 jimw@stripped +2 -0
    Un-reset thd->temporary_tables within get_all_tables() so we can get
    at temporary tables, and re-reset it before restoring the open tables
    state because that expects thd->temporary_tables to be 0.

  mysql-test/t/show_check.test
    1.54 05/08/25 16:34:39 jimw@stripped +12 -0
    Add new regression test

  mysql-test/r/show_check.result
    1.74 05/08/25 16:34:39 jimw@stripped +10 -0
    Add new results

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-12770

--- 1.274/sql/sql_show.cc	2005-08-25 00:38:55 -07:00
+++ 1.275/sql/sql_show.cc	2005-08-25 16:34:39 -07:00
@@ -1976,6 +1976,7 @@
     open and will ignore possible name-locks for these tables.
   */
   thd->reset_n_backup_open_tables_state(&open_tables_state_backup);
+  thd->temporary_tables= open_tables_state_backup.temporary_tables;
 
   if (lsel)
   {
@@ -2111,6 +2112,7 @@
 
   error= 0;
 err:
+  thd->temporary_tables= 0;
   thd->restore_backup_open_tables_state(&open_tables_state_backup);
   lex->derived_tables= derived_tables;
   lex->all_selects_list= old_all_select_lex;

--- 1.73/mysql-test/r/show_check.result	2005-08-17 08:51:04 -07:00
+++ 1.74/mysql-test/r/show_check.result	2005-08-25 16:34:39 -07:00
@@ -557,3 +557,13 @@
 DROP TABLE urkunde;
 SHOW TABLES FROM non_existing_database;
 ERROR 42000: Unknown database 'non_existing_database'
+create table t1 (c int);
+create temporary table t1 (a int);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	YES		NULL	
+drop temporary table t1;
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c	int(11)	YES		NULL	
+drop table t1;

--- 1.53/mysql-test/t/show_check.test	2005-08-17 08:51:04 -07:00
+++ 1.54/mysql-test/t/show_check.test	2005-08-25 16:34:39 -07:00
@@ -410,3 +410,15 @@
 #
 --error 1049
 SHOW TABLES FROM non_existing_database;
+
+#
+# Bug #12770: DESC doesn't show temporary tables
+#
+create table t1 (c int);
+create temporary table t1 (a int);
+desc t1;
+drop temporary table t1;
+desc t1;
+drop table t1;
+
+# End of 5.0 tests.