bk commit into 5.0 tree (anozdrin:1.2480)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik 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@stripped, 2007-07-25 18:38:52+04:00, anozdrin@ibm. +1 -0
  Allow mysql.proc to have extra (unknown) fields.
  This allows 5.0 to work with 5.1 databases.

  sql/sp.cc@stripped, 2007-07-25 18:38:48+04:00, anozdrin@ibm. +2 -2
    Allow mysql.proc to have extra (unknown) fields.
    This allows 5.0 to work with 5.1 databases.

diff -Nrup a/sql/sp.cc b/sql/sp.cc
--- a/sql/sp.cc	2007-07-12 22:26:38 +04:00
+++ b/sql/sp.cc	2007-07-25 18:38:48 +04:00
@@ -273,7 +273,7 @@ db_find_routine(THD *thd, int type, sp_n
   if ((ret= db_find_routine_aux(thd, type, name, table)) != SP_OK)
     goto done;
 
-  if (table->s->fields != MYSQL_PROC_FIELD_COUNT)
+  if (table->s->fields < MYSQL_PROC_FIELD_COUNT)
   {
     ret= SP_GET_FIELD_FAILED;
     goto done;
@@ -523,7 +523,7 @@ db_create_routine(THD *thd, int type, sp
     strxmov(definer, thd->lex->definer->user.str, "@",
             thd->lex->definer->host.str, NullS);
 
-    if (table->s->fields != MYSQL_PROC_FIELD_COUNT)
+    if (table->s->fields < MYSQL_PROC_FIELD_COUNT)
     {
       ret= SP_GET_FIELD_FAILED;
       goto done;