bk commit into 5.0 tree (gluh:1.1935)

[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.1935 05/05/07 12:21:48 gluh@stripped +1 -0
  Merge sgluhov@stripped:/home/bk/mysql-5.0
  into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897

  sql/sql_table.cc
    1.242 05/05/07 12:21:46 gluh@stripped +0 -0
    Auto merged

# 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:	mobby.(none)
# Root:	/home/gluh/MySQL/Bugs/5.0.9897/RESYNC

--- 1.241/sql/sql_table.cc	2005-05-06 10:46:07 +00:00
+++ 1.242/sql/sql_table.cc	2005-05-07 12:21:46 +00:00
@@ -2344,6 +2344,13 @@
     }
     close_thread_tables(thd);
     table->table=0;				// For query cache
+    /*
+      thd->lex->derived_tables may be set to non zero value if we open 
+      a view. It is necessary to clear thd->lex->derived_tables flag 
+      to prevent processing of derived tables during next open_and_lock_tables
+      if next table is a real table.
+    */
+    thd->lex->derived_tables= 0;
     if (protocol->write())
       goto err;
   }