1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index 5d424564317..ae11c2ad14c 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -779,9 +779,6 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
 
   int ret= 0;
 
-  if (check_stack_overrun(thd, STACK_MIN_SIZE, (uchar*)&ret))
-    return TRUE;
-
   thd->lex= &newlex;
   newlex.current_select= NULL;
 
@@ -1375,6 +1372,8 @@ public:
                         MYSQL_ERROR ** cond_hdl)
   {
     if (sql_errno == ER_NO_SUCH_TABLE ||
+        sql_errno == ER_CANNOT_LOAD_FROM_TABLE ||
+        sql_errno == ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE ||
         sql_errno == ER_COL_COUNT_DOESNT_MATCH_CORRUPTED)
       return true;
     return false;
@@ -1611,9 +1610,6 @@ sp_find_routine(THD *thd, int type, sp_name *name, sp_cache **cp,
                        (int) name->m_name.length, name->m_name.str,
                        type, cache_only));
 
-  if (check_stack_overrun(thd, STACK_MIN_SIZE, (uchar*)&depth))
-    return NULL;
-
   if ((sp= sp_cache_lookup(cp, name)))
   {
     ulong level;