Commit 0d50ab1c authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged
storage/ndb/include/kernel/AttributeHeader.hpp:
  merge
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  merge
storage/ndb/test/ndbapi/testBasic.cpp:
  merge
parents bfdfda42 80b532e2

storage/ndb/include/kernel/AttributeHeader.hpp

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public: 
  STATIC_CONST( FRAGMENT_VARSIZED_MEMORY = 0xFFF4 );

  // 0xFFF3  to be used for read packed when merged

  STATIC_CONST( ANY_VALUE    = 0xFFF2 );

  STATIC_CONST( COPY_ROWID   = 0xFFF1 );

  

  // NOTE: in 5.1 ctors and init take size in bytes

storage/ndb/include/ndbapi/NdbDictionary.hpp

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ public: 
    static const Column * ROWID;

    static const Column * ROW_GCI;

    static const Column * ANY_VALUE;

    static const Column * COPY_ROWID;

    

    int getSizeInBytes() const;

#endif

storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp

+1 −2
Original line number Diff line number Diff line
@@ -105,8 +105,7 @@ void Dbtup::removeActiveOpList(Operationrec* const regOperPtr, 
  /**

   * Release copy tuple

   */

  if(regOperPtr->op_struct.op_type != ZDELETE && 

     !regOperPtr->m_copy_tuple_location.isNull())

  if(!regOperPtr->m_copy_tuple_location.isNull())

    c_undo_buffer.free_copy_tuple(&regOperPtr->m_copy_tuple_location);

  

  if (regOperPtr->op_struct.in_active_list) {

storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,10 @@ Dbtup::read_pseudo(Uint32 attrId, 
      return 2;

    }

    return 0;

  case AttributeHeader::COPY_ROWID:

    outBuffer[0] = operPtr.p->m_copy_tuple_location.m_page_no;

    outBuffer[0] = operPtr.p->m_copy_tuple_location.m_page_idx;

    return 2;

  default:

    return 0;

  }

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

+6 −0
Original line number Diff line number Diff line
@@ -383,6 +383,11 @@ NdbColumnImpl::create_pseudo(const char * name){ 
    col->m_impl.m_attrId = AttributeHeader::ANY_VALUE;

    col->m_impl.m_attrSize = 4;

    col->m_impl.m_arraySize = 1;

  } else if(!strcmp(name, "NDB$COPY_ROWID")){

    col->setType(NdbDictionary::Column::Bigunsigned);

    col->m_impl.m_attrId = AttributeHeader::COPY_ROWID;

    col->m_impl.m_attrSize = 4;

    col->m_impl.m_arraySize = 2;

  } else {

    abort();

  }
@@ -5288,3 +5293,4 @@ const NdbDictionary::Column * NdbDictionary::Column::RECORDS_IN_RANGE = 0; 
const NdbDictionary::Column * NdbDictionary::Column::ROWID = 0;

const NdbDictionary::Column * NdbDictionary::Column::ROW_GCI = 0;

const NdbDictionary::Column * NdbDictionary::Column::ANY_VALUE = 0;

const NdbDictionary::Column * NdbDictionary::Column::COPY_ROWID = 0;