Backport of Bug#32140 to mysql-next-mr

------------------------------------------------------------
revno: 2618
revision-id: sp1r-davi@mysql.com/endora.local-20080418131946-26951
parent: sp1r-davi@mysql.com/endora.local-20080417190810-26185
committer: davi@mysql.com/endora.local
timestamp: Fri 2008-04-18 10:19:46 -0300
message:
  Bug#32140: wrong error code caught when an SF() call is interruped with KILL query

  The problem is that killing a query which calls a stored function
  could return a wrong error (table corrupt) instead of the query
  interrupted error message.

  The solution is to not set the table corrupt error if the query
  is killed, the query interrupted error message will be set  later
  when the query is finished.

sql/sp.cc

@@ -1711,6 +1711,9 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
         ret= SP_OK;
         break;
       default:
+        /* Query might have been killed, don't set error. */
+        if (thd->killed)
+          break;
         /*
           Any error when loading an existing routine is either some problem
           with the mysql.proc table, or a parse error because the contents