bk commit into 5.0 tree (pem:1.1981)

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.1981 05/12/06 14:25:12 pem@stripped +1 -0
  Final review fix of #14233: Crash after tampering with the mysql.proc table.
  Changed variable type and added comment in sp.c.

  sql/sp.cc
    1.100 05/12/06 14:25:05 pem@stripped +6 -1
    Changed variable type and added comment. (Review fix)

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/usr/home/pem/bug14233/mysql-5.0

--- 1.99/sql/sp.cc	2005-12-06 13:20:52 +01:00
+++ 1.100/sql/sp.cc	2005-12-06 14:25:05 +01:00
@@ -1462,7 +1462,7 @@
                                      bool first_no_prelock, bool *tabs_changed)
 {
   int ret= 0;
-  int tabschnd= 0;              /* Set if tables changed */
+  bool tabschnd= 0;             /* Set if tables changed */
   bool first= TRUE;
   DBUG_ENTER("sp_cache_routines_and_add_tables_aux");
 
@@ -1512,6 +1512,11 @@
         */
         if (ret == SP_PARSE_ERROR)
           thd->clear_error();
+        /*
+          If we cleared the parse error, or when db_find_routine() flagged
+          an error with it's return value without calling my_error(), we
+          set the generic "mysql.proc table corrupt" error here.
+         */
         if (!thd->net.report_error)
         {
           char n[NAME_LEN*2+2];