mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_merge

Browse source
This commit is contained in:
pekka@mysql.com 2005-12-27 16:57:50 +01:00
parent 29f44a8c77
commit a4fc69dbfb
4 changed files with 1293 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
View file

@ -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,

2
ndb/src/ndbapi/NdbEventOperationImpl.cpp
View file

@ -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);
}

5
ndb/test/ndbapi/Makefile.am
View file

@ -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)

1286
ndb/test/ndbapi/test_event_merge.cpp Normal file
View file

File diff suppressed because it is too large Load diff