From: Patrick Galbraith
Date: December 13 2005 7:51pm
Subject: bk commit into 5.1 tree (patg:1.1959)
List-Archive: http://lists.mysql.com/commits/126
Message-Id: <20051213195102.948B0BABD9@krsna.patg.net>

Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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.1959 05/12/13 11:50:48 patg@stripped +1 -0
  Merge pgalbraith@stripped:/users/rburnett/mysql-5.1-wl2682
  into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-wl2682

  sql/sql_base.cc
    1.287 05/12/13 11:50:35 patg@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:	patg
# Host:	krsna.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-wl2682/RESYNC

--- 1.286/sql/sql_base.cc	2005-12-11 20:48:22 -08:00
+++ 1.287/sql/sql_base.cc	2005-12-13 11:50:35 -08:00
@@ -2760,7 +2760,7 @@
         if (!query_tables_last_own)
           query_tables_last_own= thd->lex->query_tables_last;
         if (sp_cache_routines_and_add_tables_for_triggers(thd, thd->lex,
-                                                   tables->table->triggers))
+                                                          tables))
         {
           /*
             Serious error during reading stored routines from mysql.proc table.
@@ -2790,8 +2790,7 @@
       /* We have at least one table in TL here. */
       if (!query_tables_last_own)
         query_tables_last_own= thd->lex->query_tables_last;
-      if (sp_cache_routines_and_add_tables_for_view(thd, thd->lex,
-                                                    tables->view))
+      if (sp_cache_routines_and_add_tables_for_view(thd, thd->lex, tables))
       {
         /*
           Serious error during reading stored routines from mysql.proc table.