bk commit into 5.1 tree (andrey:1.2272)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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, 2006-08-10 12:26:43+02:00, andrey@stripped +1 -0
  revert part of the code
  how did it get in?!? (it's only in local csets so no other tree is affected)

  sql/sp.cc@stripped, 2006-08-10 12:26:40+02:00, andrey@stripped +0 -11
    revert this patch.
    how did it get in?!? (it's only in local csets so no other tree is affected)

# 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:	andrey
# Host:	example.com
# Root:	/work/mysql-5.1-runtime

--- 1.117/sql/sp.cc	2006-08-10 12:26:53 +02:00
+++ 1.118/sql/sp.cc	2006-08-10 12:26:53 +02:00
@@ -992,11 +992,6 @@
       }
       DBUG_RETURN(sp->m_first_free_instance);
     }
-    /*
-      Actually depth could be +1 than the actual value in case a SP calls
-      SHOW CREATE PROCEDURE. Hence, the linked list could hold up to one more
-      instance.
-    */
 
     level= sp->m_last_cached_sp->m_recursion_level + 1;
     if (level > depth)
@@ -1172,16 +1167,10 @@
   DBUG_ENTER("sp_show_create_procedure");
   DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
-  /*
-    Increase the recursion limit for this statement. SHOW CREATE PROCEDURE
-    does not do actual recursion.  
-  */
-  thd->variables.max_sp_recursion_depth++;
   if ((sp= sp_find_routine(thd, TYPE_ENUM_PROCEDURE, name,
                            &thd->sp_proc_cache, FALSE)))
     ret= sp->show_create_procedure(thd);
 
-  thd->variables.max_sp_recursion_depth--;
   DBUG_RETURN(ret);
 }