bk commit into 5.1 tree (jonas:1.2600)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas 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@stripped, 2008-05-20 10:56:50+02:00, jonas@stripped +1 -0
  ndb - wl3600 -
    fix incorrect assertions

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2008-05-20 10:56:48+02:00, jonas@stripped +9 -5
    fix incorrect assertions

diff -Nrup a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-05-19 17:31:02 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-05-20 10:56:48 +02:00
@@ -18012,13 +18012,17 @@ Dbdict::releaseSchemaTrans(SchemaTransPt
   c_schemaTransHash.release(trans_ptr);
   trans_ptr.setNull();
 
-  // only 1 trans at time so it is easy to check for leaks
-  ndbrequire(c_schemaOpPool.getNoOfFree() == c_schemaOpPool.getSize());
-  ndbrequire(c_opSectionBufferPool.getNoOfFree() == c_opSectionBufferPool.getSize());
+  if (c_schemaTransCount == 0)
+  {
+    jam();
+
+    ndbrequire(c_schemaOpPool.getNoOfFree() == c_schemaOpPool.getSize());
+    ndbrequire(c_opSectionBufferPool.getNoOfFree() == c_opSectionBufferPool.getSize());
 #ifdef VM_TRACE
-  if (getNodeState().startLevel == NodeState::SL_STARTED)
-    check_consistency();
+    if (getNodeState().startLevel == NodeState::SL_STARTED)
+      check_consistency();
 #endif
+  }
 }
 
 // client requests