bk commit into 5.0 tree (jimw:1.1943) BUG#11711

[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.1943 05/08/08 12:59:04 jimw@stripped +3 -0
  Report 'SYSTEM VIEW' as table_type of INFORMATION_SCHEMA views. (Bug #11711)

  sql/table.h
    1.104 05/08/08 12:59:00 jimw@stripped +2 -1
    Add SYSTEM_TMP_TABLE to tmp_table_type enum, for internal temporary
    "tables" like INFORMATION_SCHEMA views.

  sql/sql_show.cc
    1.261 05/08/08 12:59:00 jimw@stripped +5 -3
    Show 'SYSTEM VIEW' for table_type of views in INFORMATION_SCHEMA.

  mysql-test/r/information_schema.result
    1.69 05/08/08 12:59:00 jimw@stripped +6 -6
    Update 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-11711

--- 1.260/sql/sql_show.cc	2005-08-02 15:25:26 -07:00
+++ 1.261/sql/sql_show.cc	2005-08-08 12:59:00 -07:00
@@ -2034,7 +2034,7 @@
             {
               if (with_i_schema)
               {
-                table->field[3]->store("TEMPORARY", 9, system_charset_info);
+                table->field[3]->store("SYSTEM VIEW", 11, system_charset_info);
               }
               else
               {
@@ -2193,7 +2193,9 @@
     handler *file= show_table->file;
 
     file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_NO_LOCK);
-    if (share->tmp_table == TMP_TABLE)
+    if (share->tmp_table == SYSTEM_TMP_TABLE)
+      table->field[3]->store("SYSTEM VIEW", 11, cs);
+    else if (share->tmp_table)
       table->field[3]->store("TEMPORARY", 9, cs);
     else
       table->field[3]->store("BASE TABLE", 10, cs);
@@ -3532,7 +3534,7 @@
   {
     DBUG_RETURN(1);
   }
-  table->s->tmp_table= TMP_TABLE;
+  table->s->tmp_table= SYSTEM_TMP_TABLE;
   table->grant.privilege= SELECT_ACL;
   /*
     This test is necessary to make

--- 1.103/sql/table.h	2005-07-19 09:06:43 -07:00
+++ 1.104/sql/table.h	2005-08-08 12:59:00 -07:00
@@ -49,7 +49,8 @@
   ulong want_privilege;
 } GRANT_INFO;
 
-enum tmp_table_type {NO_TMP_TABLE=0, TMP_TABLE=1, TRANSACTIONAL_TMP_TABLE=2};
+enum tmp_table_type {NO_TMP_TABLE=0, TMP_TABLE=1, TRANSACTIONAL_TMP_TABLE=2,
+                     SYSTEM_TMP_TABLE=3};
 
 enum frm_type_enum
 {

--- 1.68/mysql-test/r/information_schema.result	2005-08-02 18:27:01 -07:00
+++ 1.69/mysql-test/r/information_schema.result	2005-08-08 12:59:00 -07:00
@@ -577,8 +577,8 @@
 from information_schema.tables 
 where table_schema='information_schema' limit 2;
 TABLE_NAME	TABLE_TYPE	ENGINE
-SCHEMATA	TEMPORARY	MEMORY
-TABLES	TEMPORARY	MEMORY
+SCHEMATA	SYSTEM VIEW	MEMORY
+TABLES	SYSTEM VIEW	MEMORY
 show tables from information_schema like "T%";
 Tables_in_information_schema (T%)
 TABLES
@@ -590,10 +590,10 @@
 use information_schema;
 show full tables like "T%";
 Tables_in_information_schema (T%)	Table_type
-TABLES	TEMPORARY
-TABLE_PRIVILEGES	TEMPORARY
-TABLE_CONSTRAINTS	TEMPORARY
-TRIGGERS	TEMPORARY
+TABLES	SYSTEM VIEW
+TABLE_PRIVILEGES	SYSTEM VIEW
+TABLE_CONSTRAINTS	SYSTEM VIEW
+TRIGGERS	SYSTEM VIEW
 create table t1(a int);
 ERROR 42S02: Unknown table 't1' in information_schema
 use test;