bk commit into 5.0 tree (sergefp:1.1952) BUG#12228

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1952 05/08/09 10:09:11 sergefp@stripped +1 -0
  BUG#12228: Pre-review fixes: Fix coding style, handle the case when we're out of memory.

  sql/sp_cache.cc
    1.12 05/08/09 10:09:07 sergefp@stripped +9 -2
    BUG#12228: Pre-review fixes: Fix coding style, handle the case when we're out of memory.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug12228-r4

--- 1.11/sql/sp_cache.cc	2005-08-08 23:23:29 +00:00
+++ 1.12/sql/sp_cache.cc	2005-08-09 10:09:07 +00:00
@@ -111,6 +111,11 @@
     sp_cache_insert()
       cp  The cache to put routine into
       sp  Routine to insert.
+      
+  TODO: Perhaps it will be more straightforward if in case we returned an 
+        error from this function when we couldn't allocate sp_cache. (right
+        now failure to put routine into cache will cause a 'SP not found'
+        error to be reported at some later time)
 */
 
 void sp_cache_insert(sp_cache **cp, sp_head *sp)
@@ -124,11 +129,13 @@
     pthread_mutex_lock(&Cversion_lock); // LOCK
     v= Cversion;
     pthread_mutex_unlock(&Cversion_lock); // UNLOCK
-    c->version= v;
+    if (c)
+      c->version= v;
   }
   if (c)
   {
-    DBUG_PRINT("info",("sp_cache: inserting: %*s", sp->m_qname.length, sp->m_qname.str));
+    DBUG_PRINT("info",("sp_cache: inserting: %*s", sp->m_qname.length, 
+                       sp->m_qname.str));
     c->insert(sp);
     if (*cp == NULL)
       *cp= c;