Commit ec1a4d55 authored by unknown's avatar unknown
Browse files

merge 


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
parents 2275c048 55c9c4d7

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ mysqldev@build.mysql2.com 
mysqldev@melody.local

mysqldev@mysql.com

mysqldev@o2k.irixworld.net

ndbdev@dl145b.mysql.com

ndbdev@eel.hemma.oreland.se

ndbdev@ndbmaster.mysql.com

ndbdev@shark.
@@ -268,6 +269,7 @@ tonu@x153.internalnet 
tonu@x3.internalnet

tsmith@build.mysql.com

tulin@build.mysql.com

tulin@dl145b.mysql.com

tulin@mysql.com

ulli@morbus.(none)

venu@hundin.mysql.fi

mysql-test/r/ndb_restore.result

+1 −0
Original line number Diff line number Diff line
@@ -247,3 +247,4 @@ count(*) 
3

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

520093696,1

mysql-test/t/ndb_restore.test

+6 −0
Original line number Diff line number Diff line
@@ -209,3 +209,9 @@ select count(*) 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

--enable_warnings



#

# Test BUG#10287

#



--exec $NDB_TOOLS_DIR/ndb_select_all -d sys -D , SYSTAB_0 | grep 520093696

ndb/src/kernel/blocks/dbtc/Dbtc.hpp

+2 −28
Original line number Diff line number Diff line
@@ -585,34 +585,8 @@ public: 
   */

  ArrayPool<TcIndexOperation> c_theIndexOperationPool;



  /**

   * The list of index operations

   */  

  ArrayList<TcIndexOperation> c_theIndexOperations;



  UintR c_maxNumberOfIndexOperations;   



  struct TcSeizedIndexOperation {

    /**

     * Next ptr (used in pool/list)

     */

    union {

      Uint32 nextPool;

      Uint32 nextList;

    };

    /**

     * Prev pointer (used in list)

     */

    Uint32 prevList;

  };



  /**

   * Pool of seized index operations

   */

  ArrayPool<TcSeizedIndexOperation> c_theSeizedIndexOperationPool;



  typedef Ptr<TcSeizedIndexOperation> TcSeizedIndexOperationPtr;



  /************************** API CONNECT RECORD ***********************

   * The API connect record contains the connection record to which the

   * application connects.
@@ -650,7 +624,7 @@ public: 


  struct ApiConnectRecord {

    ApiConnectRecord(ArrayPool<TcFiredTriggerData> & firedTriggerPool,

		     ArrayPool<TcSeizedIndexOperation> & seizedIndexOpPool):

		     ArrayPool<TcIndexOperation> & seizedIndexOpPool):

      theFiredTriggers(firedTriggerPool),

      isIndexOp(false),

      theSeizedIndexOperations(seizedIndexOpPool)
@@ -763,7 +737,7 @@ public: 
    UintR accumulatingIndexOp;

    UintR executingIndexOp;

    UintR tcIndxSendArray[6];

    ArrayList<TcSeizedIndexOperation> theSeizedIndexOperations;

    ArrayList<TcIndexOperation> theSeizedIndexOperations;

  };

  

  typedef Ptr<ApiConnectRecord> ApiConnectRecordPtr;

ndb/src/kernel/blocks/dbtc/DbtcInit.cpp

+1 −3
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ void Dbtc::initData() 
  c_theFiredTriggerPool.setSize(c_maxNumberOfFiredTriggers);

  c_theIndexPool.setSize(c_maxNumberOfIndexes);

  c_theIndexOperationPool.setSize(c_maxNumberOfIndexOperations);

  c_theSeizedIndexOperationPool.setSize(c_maxNumberOfIndexOperations);

  c_theAttributeBufferPool.setSize(c_transactionBufferSpace);

  c_firedTriggerHash.setSize((c_maxNumberOfFiredTriggers+10)/10);

}//Dbtc::initData()
@@ -85,7 +84,7 @@ void Dbtc::initRecords() 
  for(unsigned i = 0; i<capiConnectFilesize; i++) {

    p = &apiConnectRecord[i];

    new (p) ApiConnectRecord(c_theFiredTriggerPool, 

			     c_theSeizedIndexOperationPool);

			     c_theIndexOperationPool);

  }

  // Init all fired triggers

  DLFifoList<TcFiredTriggerData> triggers(c_theFiredTriggerPool);
@@ -177,7 +176,6 @@ Dbtc::Dbtc(const class Configuration & conf): 
  c_maxNumberOfFiredTriggers(0),

  c_theIndexes(c_theIndexPool),

  c_maxNumberOfIndexes(0),

  c_theIndexOperations(c_theIndexOperationPool),

  c_maxNumberOfIndexOperations(0),

  m_commitAckMarkerHash(m_commitAckMarkerPool)

{