bk commit into 5.1 tree (tomas:1.2049)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2049 06/01/13 17:46:37 tomas@stripped +1 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  sql/ha_ndbcluster.cc
    1.237 06/01/13 17:46:29 tomas@stripped +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new/RESYNC

--- 1.236/sql/ha_ndbcluster.cc	2006-01-13 11:51:17 +01:00
+++ 1.237/sql/ha_ndbcluster.cc	2006-01-13 17:46:29 +01:00
@@ -6441,7 +6441,7 @@
       DBUG_PRINT("error", ("get_share: %s does not exist", key));
       if (!have_lock)
         pthread_mutex_unlock(&ndbcluster_mutex);
-      return 0;
+      DBUG_RETURN(0);
     }
     if ((share= (NDB_SHARE*) my_malloc(sizeof(*share),
                                        MYF(MY_WME | MY_ZEROFILL))))
@@ -6463,7 +6463,7 @@
         *root_ptr= old_root;
         if (!have_lock)
           pthread_mutex_unlock(&ndbcluster_mutex);
-        return 0;
+        DBUG_RETURN(0);
       }
       thr_lock_init(&share->lock);
       pthread_mutex_init(&share->mutex, MY_MUTEX_INIT_FAST);
@@ -6484,7 +6484,7 @@
       if (!have_lock)
         pthread_mutex_unlock(&ndbcluster_mutex);
       my_error(ER_OUTOFMEMORY, MYF(0), sizeof(*share));
-      return 0;
+      DBUG_RETURN(0);
     }
   }
   share->use_count++;
@@ -6500,7 +6500,7 @@
               share->use_count, share->commit_count));
   if (!have_lock)
     pthread_mutex_unlock(&ndbcluster_mutex);
-  return share;
+  DBUG_RETURN(share);
 }
 
 void ndbcluster_real_free_share(NDB_SHARE **share)