bk commit into 5.0 tree (rburnett:1.2233)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of rburnett. When rburnett 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@stripped, 2006-08-09 18:02:06+02:00, rburnett@stripped +1 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
  into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
  MERGE: 1.2216.1.28

  sql/sql_view.cc@stripped, 2006-08-09 18:01:58+02:00, rburnett@stripped +0 -0
    Auto merged
    MERGE: 1.89.1.6

# 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:	rburnett
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.0-kt/RESYNC

--- 1.91/sql/sql_view.cc	2006-08-09 18:02:18 +02:00
+++ 1.92/sql/sql_view.cc	2006-08-09 18:02:18 +02:00
@@ -183,11 +183,13 @@
   TABLE_LIST decoy;
 
   memcpy (&decoy, view, sizeof (TABLE_LIST));
-  if (!open_table(thd, &decoy, thd->mem_root, &not_used, 0) &&
+  if (!open_table(thd, &decoy, thd->mem_root, &not_used, OPEN_VIEW_NO_PARSE) &&
       !decoy.view)
   {
+    /* It's a table */
     return TRUE;
   }
+
   if (!lex->definer)
   {
     view->definer.host= decoy.definer.host;
@@ -817,13 +819,14 @@
     thd			Thread handler
     parser		parser object
     table		TABLE_LIST structure for filling
-
+    flags               flags
   RETURN
     0 ok
     1 error
 */
 
-bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table)
+bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
+                     uint flags)
 {
   SELECT_LEX *end, *view_select;
   LEX *old_lex, *lex;
@@ -913,6 +916,10 @@
                         ER_VIEW_FRM_NO_USER, ER(ER_VIEW_FRM_NO_USER),
                         table->db, table->table_name);
     get_default_definer(thd, &table->definer);
+  }
+  if (flags & OPEN_VIEW_NO_PARSE)
+  {
+    DBUG_RETURN(FALSE);
   }
 
   /*