Bugfix of previous WL#1265 commit.

Need a sp_cache_remove() function with implicit name lookup to make the WL task
to work. It's a cleaner and more convenient interface anyway...

1 files changed, 5 insertions, 3 deletions

diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc
index 84e3565d543..7e9d5f92ef0 100644
--- a/sql/sp_cache.cc
+++ b/sql/sp_cache.cc
@@ -92,10 +92,11 @@ sp_cache_lookup(sp_cache **cp, char *name, uint namelen)
   return c->lookup(name, namelen);
 }
 
-void
-sp_cache_remove(sp_cache **cp, sp_head *sp)
+sp_head *
+sp_cache_remove(sp_cache **cp, char *name, uint namelen)
 {
   sp_cache *c= *cp;
+  sp_head *sp= NULL;
 
   if (c)
   {
@@ -108,9 +109,10 @@ sp_cache_remove(sp_cache **cp, sp_head *sp)
     if (c->version < v)
       c->remove_all();
     else
-      c->remove(sp);
+      sp= c->remove(name, namelen);
     c->version= v+1;
   }
+  return sp;
 }