Commit fc347af5 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 42fb5937 d831ff26

ndb/src/kernel/vm/Configuration.cpp

+2 −2
Original line number Diff line number Diff line
@@ -750,8 +750,8 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){ 
	    noOfMetaTables);

    

    cfg.put(CFG_TUP_TABLE_DESC, 

	    4 * NO_OF_FRAG_PER_NODE * noOfAttributes* noOfReplicas +

	    12 * NO_OF_FRAG_PER_NODE * noOfMetaTables* noOfReplicas );

	    2 * 6 * NO_OF_FRAG_PER_NODE * noOfAttributes * noOfReplicas +

	    2 * 10 * NO_OF_FRAG_PER_NODE * noOfMetaTables * noOfReplicas );

    

    cfg.put(CFG_TUP_STORED_PROC,

	    noOfLocalScanRecords);

ndb/src/ndbapi/NdbDictionaryImpl.cpp

+25 −21
Original line number Diff line number Diff line
@@ -1571,7 +1571,13 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb, 


  NdbApiSignal tSignal(m_reference);

  tSignal.theReceiversBlockNumber = DBDICT;

  if (alter) {

  

  LinearSectionPtr ptr[3];

  ptr[0].p = (Uint32*)m_buffer.get_data();

  ptr[0].sz = m_buffer.length() / 4;

  int ret;

  if (alter)

  {

    AlterTableReq * const req = 

      CAST_PTR(AlterTableReq, tSignal.getDataPtrSend());
@@ -1582,8 +1588,10 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb, 
    req->tableVersion = impl.m_version;;

    tSignal.theVerId_signalNumber   = GSN_ALTER_TABLE_REQ;

    tSignal.theLength = AlterTableReq::SignalLength;

    ret= alterTable(&tSignal, ptr);

  }

  else {

  else

  {

    CreateTableReq * const req = 

      CAST_PTR(CreateTableReq, tSignal.getDataPtrSend());
@@ -1591,17 +1599,12 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb, 
    req->senderData = 0;

    tSignal.theVerId_signalNumber   = GSN_CREATE_TABLE_REQ;

    tSignal.theLength = CreateTableReq::SignalLength;

  }

  

  LinearSectionPtr ptr[3];

  ptr[0].p = (Uint32*)m_buffer.get_data();

  ptr[0].sz = m_buffer.length() / 4;

    ret= createTable(&tSignal, ptr);



  int ret = (alter) ?

    alterTable(&tSignal, ptr)

    : createTable(&tSignal, ptr);

    if (ret)

      return ret;



  if (!alter && haveAutoIncrement) {

    if (haveAutoIncrement) {

      if (!ndb.setAutoIncrementValue(impl.m_externalName.c_str(),

				     autoIncrementValue)) {

	if (ndb.theError.code == 0) {
@@ -1612,6 +1615,7 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb, 
	ret = -1; // errorcode set in initialize_autoincrement

      }

    }

  }

  return ret;

}