bk commit into 5.1 tree (tomas:1.2381)

[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.2381 06/05/05 15:34:46 tomas@stripped +2 -0
      do not install ndb slave if no slaves
      fixed memleak in ndbcluster_end

  sql/ha_ndbcluster.cc
    1.300 06/05/05 15:34:38 tomas@stripped +2 -2
    fixed memleak in ndbcluster_end

  mysql-test/mysql-test-run.pl
    1.113 06/05/05 15:34:38 tomas@stripped +1 -1
    do not install ndb slave if no slaves

# 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-ndb

--- 1.112/mysql-test/mysql-test-run.pl	2006-05-01 09:14:28 +02:00
+++ 1.113/mysql-test/mysql-test-run.pl	2006-05-05 15:34:38 +02:00
@@ -1857,7 +1857,7 @@
     }
   }
 
-  if ( ndbcluster_install_slave() )
+  if ( $use_slaves and ndbcluster_install_slave() )
   {
     if ( $opt_force)
     {

--- 1.299/sql/ha_ndbcluster.cc	2006-05-04 21:55:02 +02:00
+++ 1.300/sql/ha_ndbcluster.cc	2006-05-05 15:34:38 +02:00
@@ -6217,10 +6217,10 @@
 #ifdef HAVE_NDB_BINLOG
   {
     pthread_mutex_lock(&ndbcluster_mutex);
-    for (uint i= 0; i < ndbcluster_open_tables.records; i++)
+    while (ndbcluster_open_tables.records)
     {
       NDB_SHARE *share=
-        (NDB_SHARE*) hash_element(&ndbcluster_open_tables, i);
+        (NDB_SHARE*) hash_element(&ndbcluster_open_tables, 0);
 #ifndef DBUG_OFF
       fprintf(stderr, "NDB: table share %s with use_count %d not freed\n",
               share->key, share->use_count);