Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
eecf4999
Commit
eecf4999
authored
Dec 28, 2005
by
ingo@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug5390
parents
bd1b724b
76bdccd0
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1293 additions
and
2 deletions
+1293
-2
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+2
-0
ndb/src/ndbapi/NdbEventOperationImpl.cpp
ndb/src/ndbapi/NdbEventOperationImpl.cpp
+1
-1
ndb/test/ndbapi/Makefile.am
ndb/test/ndbapi/Makefile.am
+4
-1
ndb/test/ndbapi/test_event_merge.cpp
ndb/test/ndbapi/test_event_merge.cpp
+1286
-0
No files found.
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
View file @
eecf4999
...
...
@@ -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
View file @
eecf4999
...
...
@@ -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
View file @
eecf4999
...
...
@@ -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
View file @
eecf4999
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment