diff options
author | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 00:09:52 +0000 |
---|---|---|
committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 00:09:52 +0000 |
commit | 9a51ad2c541d6fe93b82a09d334278dd1170e780 (patch) | |
tree | e7d2073fc03c4d483a2006572c2db6a9fdee7ec1 /sql/sp_cache.cc | |
parent | 25ecb311168dba7cdb5a07713743d5baf595a93c (diff) | |
parent | 8dc0091c214271fbcbe4ae9a0b0d6de5c78fae6e (diff) | |
download | mariadb-git-9a51ad2c541d6fe93b82a09d334278dd1170e780.tar.gz |
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7
Fixed conflicts in:
- binlog.binlog_unsafe
- rpl.rpl_slow_query_log
Diffstat (limited to 'sql/sp_cache.cc')
-rw-r--r-- | sql/sp_cache.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc index 64898915b7e..b8209a373a2 100644 --- a/sql/sp_cache.cc +++ b/sql/sp_cache.cc @@ -36,10 +36,16 @@ public: sp_cache(); ~sp_cache(); - inline void insert(sp_head *sp) + /** + Inserts a sp_head object into a hash table. + + @returns Success status + @return TRUE Failure + @return FALSE Success + */ + inline bool insert(sp_head *sp) { - /* TODO: why don't we check return value? */ - my_hash_insert(&m_hashtable, (const uchar *)sp); + return my_hash_insert(&m_hashtable, (const uchar *)sp); } inline sp_head *lookup(char *name, uint namelen) |