bk commit into 4.1 tree (elliot:1.2305) BUG#10442

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
4.1 repository of emurphy. When emurphy 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.2305 05/06/21 15:40:58 elliot@stripped +3 -0
  BUG#10442 Minor changes from code review

  sql/sql_parse.cc
    1.445 05/06/21 15:40:55 elliot@stripped +5 -3
    Changes from code review

  mysql-test/t/rpl_multi_update3.test
    1.2 05/06/21 15:40:55 elliot@stripped +1 -0
    Changes from code review

  mysql-test/r/rpl_multi_update3.result
    1.2 05/06/21 15:40:55 elliot@stripped +1 -0
    Changes from code review

# 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:	elliot
# Host:	agony.local
# Root:	/Users/emurphy/src/work/mysql-4.1-bug10442

--- 1.444/sql/sql_parse.cc	2005-06-17 11:15:25 -04:00
+++ 1.445/sql/sql_parse.cc	2005-06-21 15:40:55 -04:00
@@ -1943,9 +1943,11 @@
   if (tables || &lex->select_lex != lex->all_selects_list)
     mysql_reset_errors(thd);
 
-  /* 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. */
+  /* 
+     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))

--- 1.1/mysql-test/r/rpl_multi_update3.result	2005-06-16 16:32:31 -04:00
+++ 1.2/mysql-test/r/rpl_multi_update3.result	2005-06-21 15:40:55 -04:00
@@ -40,3 +40,4 @@
 a	b
 1	6
 2	6
+drop table t1,t2;

--- 1.1/mysql-test/t/rpl_multi_update3.test	2005-06-16 16:31:14 -04:00
+++ 1.2/mysql-test/t/rpl_multi_update3.test	2005-06-21 15:40:55 -04:00
@@ -31,3 +31,4 @@
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 
+drop table t1,t2;