bk commit into 4.1 tree (jimw:1.2360)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 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.2360 05/07/15 10:52:22 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-9979
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/sql_parse.cc
    1.452 05/07/15 10:52:19 jimw@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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-clean/RESYNC

--- 1.451/sql/sql_parse.cc	2005-07-13 06:38:51 -07:00
+++ 1.452/sql/sql_parse.cc	2005-07-15 10:52:19 -07:00
@@ -1940,7 +1940,8 @@
     that is not a SHOW command or a select that only access local
     variables, but for now this is probably good enough.
   */
-  if (tables || &lex->select_lex != lex->all_selects_list)
+  if (tables || &lex->select_lex != lex->all_selects_list ||
+      lex->time_zone_tables_used)
     mysql_reset_errors(thd);
 
   /*
@@ -5413,7 +5414,7 @@
   /*
     Is there tables of subqueries?
   */
-  if (&lex->select_lex != lex->all_selects_list)
+  if (&lex->select_lex != lex->all_selects_list || lex->time_zone_tables_used)
   {
     DBUG_PRINT("info",("Checking sub query list"));
     for (table= tables; table; table= table->next)