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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e50c49b2
Commit
e50c49b2
authored
Sep 21, 2005
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
parents
d1ee898d
ed8f33f0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
ndb/src/kernel/blocks/backup/Backup.cpp
ndb/src/kernel/blocks/backup/Backup.cpp
+1
-0
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+2
-1
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
+7
-5
No files found.
ndb/src/kernel/blocks/backup/Backup.cpp
View file @
e50c49b2
...
@@ -3265,6 +3265,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal)
...
@@ -3265,6 +3265,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal)
req
->
requestInfo
=
0
;
req
->
requestInfo
=
0
;
req
->
savePointId
=
0
;
req
->
savePointId
=
0
;
req
->
tableId
=
table
.
tableId
;
req
->
tableId
=
table
.
tableId
;
ScanFragReq
::
setReadCommittedFlag
(
req
->
requestInfo
,
1
);
ScanFragReq
::
setLockMode
(
req
->
requestInfo
,
0
);
ScanFragReq
::
setLockMode
(
req
->
requestInfo
,
0
);
ScanFragReq
::
setHoldLockFlag
(
req
->
requestInfo
,
0
);
ScanFragReq
::
setHoldLockFlag
(
req
->
requestInfo
,
0
);
ScanFragReq
::
setKeyinfoFlag
(
req
->
requestInfo
,
0
);
ScanFragReq
::
setKeyinfoFlag
(
req
->
requestInfo
,
0
);
...
...
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
View file @
e50c49b2
...
@@ -1737,7 +1737,8 @@ private:
...
@@ -1737,7 +1737,8 @@ private:
Uint32
*
const
mainBuffer
,
Uint32
*
const
mainBuffer
,
Uint32
&
noMainWords
,
Uint32
&
noMainWords
,
Uint32
*
const
copyBuffer
,
Uint32
*
const
copyBuffer
,
Uint32
&
noCopyWords
);
Uint32
&
noCopyWords
,
bool
xfrm
);
void
sendTrigAttrInfo
(
Signal
*
signal
,
void
sendTrigAttrInfo
(
Signal
*
signal
,
Uint32
*
data
,
Uint32
*
data
,
...
...
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
View file @
e50c49b2
...
@@ -622,7 +622,8 @@ void Dbtup::executeTrigger(Signal* signal,
...
@@ -622,7 +622,8 @@ void Dbtup::executeTrigger(Signal* signal,
mainBuffer
,
mainBuffer
,
noMainWords
,
noMainWords
,
copyBuffer
,
copyBuffer
,
noCopyWords
))
{
noCopyWords
,
(
ref
==
BACKUP
?
false
:
true
)))
{
ljam
();
ljam
();
return
;
return
;
}
//if
}
//if
...
@@ -727,7 +728,8 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
...
@@ -727,7 +728,8 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
Uint32
*
const
mainBuffer
,
Uint32
*
const
mainBuffer
,
Uint32
&
noMainWords
,
Uint32
&
noMainWords
,
Uint32
*
const
copyBuffer
,
Uint32
*
const
copyBuffer
,
Uint32
&
noCopyWords
)
Uint32
&
noCopyWords
,
bool
xfrm
)
{
{
noCopyWords
=
0
;
noCopyWords
=
0
;
noMainWords
=
0
;
noMainWords
=
0
;
...
@@ -757,7 +759,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
...
@@ -757,7 +759,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
regTabPtr
->
noOfKeyAttr
,
regTabPtr
->
noOfKeyAttr
,
keyBuffer
,
keyBuffer
,
ZATTR_BUFFER_SIZE
,
ZATTR_BUFFER_SIZE
,
true
);
xfrm
);
ndbrequire
(
ret
!=
-
1
);
ndbrequire
(
ret
!=
-
1
);
noPrimKey
=
ret
;
noPrimKey
=
ret
;
...
@@ -800,7 +802,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
...
@@ -800,7 +802,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
numAttrsToRead
,
numAttrsToRead
,
mainBuffer
,
mainBuffer
,
ZATTR_BUFFER_SIZE
,
ZATTR_BUFFER_SIZE
,
true
);
xfrm
);
ndbrequire
(
ret
!=
-
1
);
ndbrequire
(
ret
!=
-
1
);
noMainWords
=
ret
;
noMainWords
=
ret
;
}
else
{
}
else
{
...
@@ -826,7 +828,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
...
@@ -826,7 +828,7 @@ bool Dbtup::readTriggerInfo(TupTriggerData* const trigPtr,
numAttrsToRead
,
numAttrsToRead
,
copyBuffer
,
copyBuffer
,
ZATTR_BUFFER_SIZE
,
ZATTR_BUFFER_SIZE
,
true
);
xfrm
);
ndbrequire
(
ret
!=
-
1
);
ndbrequire
(
ret
!=
-
1
);
noCopyWords
=
ret
;
noCopyWords
=
ret
;
...
...
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