Commit dcb7fce7 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-simple-read 

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
parents 15157cd7 69cce99b

mysql-test/suite/ndb/t/disabled.def

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
#  Do not use any TAB characters for whitespace.

#

##############################################################################

ndb_dd_sql_features      : Bug#29102 ndb_dd_sql_features fails in pushbuild

ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed



partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table



ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms

storage/ndb/include/kernel/signaldata/TcKeyConf.hpp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public: 
   */

  STATIC_CONST( StaticLength = 5 );

  STATIC_CONST( OperationLength = 2 );

  STATIC_CONST( SimpleReadBit = (((Uint32)1) << 31) );

  STATIC_CONST( DirtyReadBit = (((Uint32)1) << 31) );

  

private:

storage/ndb/include/ndbapi/NdbOperation.hpp

+2 −1
Original line number Diff line number Diff line
@@ -93,8 +93,9 @@ public: 
    ,LM_CommittedRead       ///< Ignore locks, read last committed value

#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

    = 2,

    LM_Dirty = 2

    LM_Dirty = 2,

#endif

    LM_SimpleRead = 3       ///< Read with shared lock, but release lock directly

  };



  /**

storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp

+2 −2
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ printTCKEYCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receive 
	    (TcKeyConf::getMarkerFlag(confInfo) == 0)?"false":"true");

    fprintf(output, "Operations:\n");

    for(i = 0; i < noOfOp; i++) {

      if(sig->operations[i].attrInfoLen > TcKeyConf::SimpleReadBit)

      if(sig->operations[i].attrInfoLen > TcKeyConf::DirtyReadBit)

	fprintf(output,

		" apiOperationPtr: H'%.8x, simplereadnode: %u\n",

		sig->operations[i].apiOperationPtr,

		sig->operations[i].attrInfoLen & (~TcKeyConf::SimpleReadBit));

		sig->operations[i].attrInfoLen & (~TcKeyConf::DirtyReadBit));

      else

	fprintf(output,

		" apiOperationPtr: H'%.8x, attrInfoLen: %u\n",

storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp

+0 −1
Original line number Diff line number Diff line
@@ -2025,7 +2025,6 @@ public: 
    Uint8 reclenAiLqhkey;

    Uint8 m_offset_current_keybuf;

    Uint8 replicaType;

    Uint8 simpleRead;

    Uint8 seqNoReplica;

    Uint8 tcNodeFailrec;

    Uint8 m_disk_table;