Commit 61938527 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/50-work 

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
parents 168a6104 07908a45

mysql-test/r/ndb_bitfield.result

+6 −0
Original line number Diff line number Diff line
@@ -208,3 +208,9 @@ b bit(9), 
key(b)

) engine=ndbcluster;

ERROR HY000: Can't create table './test/t1.frm' (errno: 743)

create table t1 (

pk1 int primary key,

b bit(32) not null

) engine=ndbcluster;

insert into t1 values (1,1);

drop table t1;

mysql-test/t/ndb_bitfield.test

+8 −0
Original line number Diff line number Diff line
@@ -112,3 +112,11 @@ create table t1 ( 
  key(b)

) engine=ndbcluster;



# bug#16125

create table t1 (

  pk1 int primary key,

  b bit(32) not null

) engine=ndbcluster;



insert into t1 values (1,1);

drop table t1;

ndb/include/util/Bitmask.hpp

+2 −2
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ inline void 
BitmaskImpl::getField(unsigned size, const Uint32 src[],

		      unsigned pos, unsigned len, Uint32 dst[])

{

  assert(pos + len < (size << 5));

  assert(pos + len <= (size << 5));

  

  src += (pos >> 5);

  Uint32 offset = pos & 31;
@@ -833,7 +833,7 @@ inline void 
BitmaskImpl::setField(unsigned size, Uint32 dst[],

		      unsigned pos, unsigned len, const Uint32 src[])

{

  assert(pos + len < (size << 5));

  assert(pos + len <= (size << 5));



  dst += (pos >> 5);

  Uint32 offset = pos & 31;

ndb/src/kernel/blocks/ERROR_codes.txt

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Next NDBCNTR 1000 
Next NDBFS 2000

Next DBACC 3002

Next DBTUP 4013

Next DBLQH 5042

Next DBLQH 5043

Next DBDICT 6007

Next DBDIH 7174

Next DBTC 8037
@@ -314,6 +314,8 @@ LQH: 
5026  Crash when receiving COPY_ACTIVEREQ

5027  Crash when receiving STAT_RECREQ



5042  Crash starting node, when scan is finished on primary replica



Test Crashes in handling take over

----------------------------------

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+9 −0
Original line number Diff line number Diff line
@@ -9264,6 +9264,15 @@ void Dblqh::nextScanConfCopyLab(Signal* signal) 
// completion. Signal completion through scanCompletedStatus-flag.

/*---------------------------------------------------------------------------*/

    scanptr.p->scanCompletedStatus = ZTRUE;

    scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY;

    if (ERROR_INSERTED(5042))

    {

      CLEAR_ERROR_INSERT_VALUE;

      tcConnectptr.p->copyCountWords = ~0;

      signal->theData[0] = 9999;

      sendSignal(numberToRef(CMVMI, scanptr.p->scanNodeId),

		 GSN_NDB_TAMPER, signal, 1, JBA);

    }

    return;

  }//if