diff options
| author | unknown <pem@mysql.comhem.se> | 2003-10-21 18:13:14 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-10-21 18:13:14 +0200 |
| commit | 7e8cc90a8b3ca552c4a81047becb439bad475e96 (patch) | |
| tree | a3a87b6322217cf5bb7b269594bbf65f2bff8b8b /sql/sp_cache.h | |
| parent | 562a04d593ca9a179b851e1d71d30e764e55f7ad (diff) | |
| download | mariadb-git-7e8cc90a8b3ca552c4a81047becb439bad475e96.tar.gz | |
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...
sql/sp.cc:
Modified sp_cache_remove() function calls; just remove by name.
sql/sp_cache.cc:
Modified sp_cache_remove() function. Get name and lookup/remove, return the
removed entry, if any.
sql/sp_cache.h:
Modified sp_cache_remove() function. Get name and lookup/remove, return the
removed entry, if any.
Diffstat (limited to 'sql/sp_cache.h')
| -rw-r--r-- | sql/sp_cache.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/sp_cache.h b/sql/sp_cache.h index f5b330f6755..3d38d6f1d1f 100644 --- a/sql/sp_cache.h +++ b/sql/sp_cache.h @@ -38,7 +38,7 @@ void sp_cache_insert(sp_cache **cp, sp_head *sp); sp_head *sp_cache_lookup(sp_cache **cp, char *name, uint namelen); /* Remove an SP from cache */ -void sp_cache_remove(sp_cache **cp, sp_head *sp); +sp_head *sp_cache_remove(sp_cache **cp, char *name, uint namelen); /* @@ -75,10 +75,14 @@ public: return (sp_head *)hash_search(&m_hashtable, (const byte *)name, namelen); } - inline void - remove(sp_head *sp) + inline sp_head * + remove(char *name, uint namelen) { - hash_delete(&m_hashtable, (byte *)sp); + sp_head *sp= lookup(name, namelen); + + if (sp) + hash_delete(&m_hashtable, (byte *)sp); + return sp; } inline void |