1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
This commit is contained in:
ingo@mysql.com 2005-12-28 09:18:57 +01:00
commit eecf49999d
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->changeMask.bitOR(attributeMask);
befOpPtr.p->gci = regOperPtr->gci; befOpPtr.p->gci = regOperPtr->gci;
befOpPtr.p->optype = opType;
operPtr.p = befOpPtr.p; operPtr.p = befOpPtr.p;
checkDetachedTriggers(signal, checkDetachedTriggers(signal,
befOpPtr.p, befOpPtr.p,
@ -483,6 +484,7 @@ Dbtup::commitRecord(Signal* signal,
befOpPtr.p->pageIndex = befOpPtr.p->pageIndexC; befOpPtr.p->pageIndex = befOpPtr.p->pageIndexC;
befOpPtr.p->gci = regOperPtr->gci; befOpPtr.p->gci = regOperPtr->gci;
befOpPtr.p->optype = opType;
operPtr.p = befOpPtr.p; operPtr.p = befOpPtr.p;
checkDetachedTriggers(signal, checkDetachedTriggers(signal,
befOpPtr.p, befOpPtr.p,

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

@ -250,10 +250,10 @@ NdbEventOperationImpl::execute()
int hasSubscriber; int hasSubscriber;
int r= m_bufferHandle->prepareAddSubscribeEvent(this, int r= m_bufferHandle->prepareAddSubscribeEvent(this,
hasSubscriber /*return value*/); hasSubscriber /*return value*/);
m_error.code= 4709;
if (r < 0) if (r < 0)
{ {
m_error.code= 4709;
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }

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

@ -35,7 +35,8 @@ testPartitioning \
testBitfield \ testBitfield \
DbCreate DbAsyncGenerator \ DbCreate DbAsyncGenerator \
test_event_multi_table \ test_event_multi_table \
testSRBank testSRBank \
test_event_merge
#flexTimedAsynch #flexTimedAsynch
#testBlobs #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 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 test_event_multi_table_SOURCES = test_event_multi_table.cpp
testSRBank_SOURCES = testSRBank.cpp testSRBank_SOURCES = testSRBank.cpp
test_event_merge_SOURCES = test_event_merge.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel 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-includes $@ $(INCLUDES)
@$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES) @$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) @$(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