bk commit into 5.1 tree (tomas:1.2376)

[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.2376 06/05/15 20:24:50 tomas@stripped +2 -0
  ndb: dict cache reference not released as it should

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.132 06/05/15 20:24:42 tomas@stripped +5 -2
    ndb: dict cache reference not released as it should

  storage/ndb/src/ndbapi/DictCache.cpp
    1.23 06/05/15 20:24:41 tomas@stripped +2 -2
    changed dbug printout

# 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.22/storage/ndb/src/ndbapi/DictCache.cpp	2006-05-04 13:58:06 +02:00
+++ 1.23/storage/ndb/src/ndbapi/DictCache.cpp	2006-05-15 20:24:41 +02:00
@@ -134,8 +134,8 @@
       const unsigned sz = vers->size();
       for(unsigned i = 0; i<sz ; i++){
         TableVersion tv= (*vers)[i];
-        DBUG_PRINT("  ", ("vers[%d]: ver: %d, refCount: %d, status: %d",
-                          sz, tv.m_version, tv.m_refCount, tv.m_status));
+        DBUG_PRINT("  ", ("impl: %p  vers[%d]: ver: %d, refCount: %d, status: %d",
+                          tv.m_impl, i, tv.m_version, tv.m_refCount, tv.m_status));
         if(tv.m_impl != 0)
         {
           DBUG_PRINT("  ", ("m_impl: internalname: %s",

--- 1.131/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-09 21:08:01 +02:00
+++ 1.132/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-15 20:24:42 +02:00
@@ -3725,9 +3725,12 @@
         DBUG_RETURN(NULL);
       }
     }
+    ev->setTable(tab);
+    releaseTableGlobal(*tab, 0);
   }
-
-  ev->setTable(tab);
+  else
+    ev->setTable(tab);
+  tab = 0;
 
   ev->setTable(m_ndb.externalizeTableName(ev->getTableName()));  
   // get the columns from the attrListBitmask