bk commit into 4.1 tree (acurtis:1.2292)

[antony]

Below is the list of changes that have just been committed into a local
4.1 repository of antony. When antony 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.2292 05/05/24 13:38:46 acurtis@stripped +1 -0
  Add comments

  sql/sql_parse.cc
    1.435 05/05/24 13:38:32 acurtis@stripped +7 -0
    Add comments

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/usr/home/antony/work2/p3-bug7241.5

--- 1.434/sql/sql_parse.cc	2005-05-24 11:44:21 +01:00
+++ 1.435/sql/sql_parse.cc	2005-05-24 13:38:32 +01:00
@@ -1992,6 +1992,10 @@
 #endif
   }
 #endif /* !HAVE_REPLICATION */
+
+  /* When subselects or time_zone info is used in a query
+   * we create a new TABLE_LIST containing all referenced tables
+   * and set local variable 'tables' to point to this list. */
   if ((&lex->select_lex != lex->all_selects_list ||
        lex->time_zone_tables_used) &&
       lex->unit.create_total_list(thd, lex, &tables))
@@ -5438,6 +5442,9 @@
     }
     walk->lock_type= target_tbl->lock_type;
     target_tbl->table_list= walk;	// Remember corresponding table
+    
+    /* in case of subselects, we need to set lock_type in
+     * corresponding table in list of all tables */
     if (walk->table_list)
     {
       target_tbl->table_list= walk->table_list;