Commit 4f5664f3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-bug5390
parents 1c74210e 6706115c

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

+2 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ Dbtup::commitRecord(Signal* signal, 
    befOpPtr.p->changeMask.bitOR(attributeMask);

    befOpPtr.p->gci = regOperPtr->gci;

    

    befOpPtr.p->optype = opType;

    operPtr.p = befOpPtr.p;

    checkDetachedTriggers(signal,

                          befOpPtr.p,
@@ -483,6 +484,7 @@ Dbtup::commitRecord(Signal* signal, 
    befOpPtr.p->pageIndex  = befOpPtr.p->pageIndexC;

    befOpPtr.p->gci = regOperPtr->gci;



    befOpPtr.p->optype = opType;

    operPtr.p = befOpPtr.p;

    checkDetachedTriggers(signal,

                          befOpPtr.p,

ndb/src/ndbapi/NdbEventOperationImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -250,10 +250,10 @@ NdbEventOperationImpl::execute() 
  int hasSubscriber;

  int r= m_bufferHandle->prepareAddSubscribeEvent(this,

						  hasSubscriber /*return value*/);

  m_error.code= 4709;



  if (r < 0)

  {

    m_error.code= 4709;

    DBUG_RETURN(-1);

  }

ndb/test/ndbapi/Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ testPartitioning \ 
testBitfield \

DbCreate DbAsyncGenerator \

test_event_multi_table \

testSRBank

testSRBank \

test_event_merge



#flexTimedAsynch

#testBlobs
@@ -80,6 +81,7 @@ DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterfa 
DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp

test_event_multi_table_SOURCES = test_event_multi_table.cpp

testSRBank_SOURCES = testSRBank.cpp

test_event_merge_SOURCES = test_event_merge.cpp



INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
@@ -160,3 +162,4 @@ testScan.dsp: Makefile \ 
	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)

	@$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)

	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)

ndb/test/ndbapi/test_event_merge.cpp

0 → 100644
+1286 −0

File added.

Preview size limit exceeded, changes collapsed.