bk commit into 5.0 tree (jonas:1.1980)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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
  1.1980 05/09/20 12:07:18 jonas@stripped +3 -0
  ndb - post merge fixes

  sql/ha_ndbcluster.cc
    1.207 05/09/20 12:07:15 jonas@stripped +2 -3
    post merge fixes

  ndb/src/ndbapi/Ndblist.cpp
    1.17 05/09/20 12:07:15 jonas@stripped +0 -7
    post merge fixes

  ndb/include/ndbapi/NdbTransaction.hpp
    1.43 05/09/20 12:07:15 jonas@stripped +1 -1
    post merge fixes

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.0

--- 1.42/ndb/include/ndbapi/NdbTransaction.hpp	2005-09-20 10:46:30 +02:00
+++ 1.43/ndb/include/ndbapi/NdbTransaction.hpp	2005-09-20 12:07:15 +02:00
@@ -806,7 +806,7 @@
   void define_scan_op(NdbIndexScanOperation*);
 
   friend class HugoOperations;
-  friend struct Ndb_free_list_t<NdbConnection>;
+  friend struct Ndb_free_list_t<NdbTransaction>;
 };
 
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

--- 1.16/ndb/src/ndbapi/Ndblist.cpp	2005-09-20 10:46:30 +02:00
+++ 1.17/ndb/src/ndbapi/Ndblist.cpp	2005-09-20 12:07:15 +02:00
@@ -132,13 +132,6 @@
 Ndb::getNdbCon()
 {
   NdbTransaction* tNdbCon = theImpl->theConIdleList.seize(this);
-  if (unlikely(theImpl->theConIdleList.m_alloc_cnt > theMaxNoOfTransactions)) 
-  {
-    theImpl->theConIdleList.release(tNdbCon);
-    ndbout << "theNoOfAllocatedTransactions = " << theNoOfAllocatedTransactions << " theMaxNoOfTransactions = " << theMaxNoOfTransactions << endl;
-    return NULL;
-  }//if
-  
   tNdbCon->theMagicNumber = 0x37412619;
   return tNdbCon;
 }

--- 1.206/sql/ha_ndbcluster.cc	2005-09-20 10:46:31 +02:00
+++ 1.207/sql/ha_ndbcluster.cc	2005-09-20 12:07:15 +02:00
@@ -7416,10 +7416,9 @@
   if (protocol->send_fields(&field_list, 1))
     DBUG_RETURN(TRUE);
   
-  if (thd->transaction.thd_ndb &&
-      ((Thd_ndb*)thd->transaction.thd_ndb)->ndb)
+  if (get_thd_ndb(thd) && get_thd_ndb(thd)->ndb)
   {
-    Ndb* ndb= ((Thd_ndb*)thd->transaction.thd_ndb)->ndb;
+    Ndb* ndb= (get_thd_ndb(thd))->ndb;
     Ndb::Free_list_usage tmp; tmp.m_name= 0;
     while (ndb->get_free_list_usage(&tmp))
     {