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
03f79011
Commit
03f79011
authored
Sep 02, 2005
by
jonas@eel.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge eel.(none):/home/jonas/src/mysql-4.1
into eel.(none):/home/jonas/src/mysql-4.1-push
parents
375dc153
4b80ed1b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
43 additions
and
6 deletions
+43
-6
ndb/include/kernel/signaldata/SignalData.hpp
ndb/include/kernel/signaldata/SignalData.hpp
+1
-0
ndb/include/kernel/signaldata/StartFragReq.hpp
ndb/include/kernel/signaldata/StartFragReq.hpp
+2
-0
ndb/src/common/debugger/EventLogger.cpp
ndb/src/common/debugger/EventLogger.cpp
+4
-2
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
+1
-0
ndb/src/common/debugger/signaldata/StartRec.cpp
ndb/src/common/debugger/signaldata/StartRec.cpp
+25
-0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+9
-3
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+1
-1
No files found.
ndb/include/kernel/signaldata/SignalData.hpp
View file @
03f79011
...
...
@@ -215,5 +215,6 @@ GSN_PRINT_SIGNATURE(printSCAN_FRAGREQ);
GSN_PRINT_SIGNATURE
(
printCONTINUEB_NDBFS
);
GSN_PRINT_SIGNATURE
(
printCONTINUEB_DBDIH
);
GSN_PRINT_SIGNATURE
(
printSTART_FRAG_REQ
);
#endif
ndb/include/kernel/signaldata/StartFragReq.hpp
View file @
03f79011
...
...
@@ -32,6 +32,8 @@ class StartFragReq {
public:
STATIC_CONST
(
SignalLength
=
19
);
friend
bool
printSTART_FRAG_REQ
(
FILE
*
,
const
Uint32
*
,
Uint32
,
Uint16
);
private:
Uint32
userPtr
;
Uint32
userRef
;
...
...
ndb/src/common/debugger/EventLogger.cpp
View file @
03f79011
...
...
@@ -585,11 +585,13 @@ EventLogger::getText(char * m_text, size_t m_text_len,
BaseString
::
snprintf
(
m_text
,
m_text_len
,
"%sTable ID = %u, fragment ID = %u has completed LCP "
"on Node %u"
,
"on Node %u
maxGciStarted: %d maxGciCompleted: %d
"
,
theNodeId
,
theData
[
2
],
theData
[
3
],
theData
[
1
]);
theData
[
1
],
theData
[
4
],
theData
[
5
]);
break
;
case
EventReport
:
:
TransReportCounters
:
// -------------------------------------------------------------------
...
...
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
View file @
03f79011
...
...
@@ -195,6 +195,7 @@ SignalDataPrintFunctions[] = {
,{
GSN_ACC_LOCKREQ
,
printACC_LOCKREQ
}
,{
GSN_LQH_TRANSCONF
,
printLQH_TRANSCONF
}
,{
GSN_SCAN_FRAGREQ
,
printSCAN_FRAGREQ
}
,{
GSN_START_FRAGREQ
,
printSTART_FRAG_REQ
}
,{
0
,
0
}
};
...
...
ndb/src/common/debugger/signaldata/StartRec.cpp
View file @
03f79011
...
...
@@ -17,6 +17,7 @@
#include <RefConvert.hpp>
#include <signaldata/StartRec.hpp>
#include <signaldata/StartFragReq.hpp>
bool
printSTART_REC_REQ
(
FILE
*
output
,
...
...
@@ -50,3 +51,27 @@ printSTART_REC_CONF(FILE * output,
return
true
;
}
bool
printSTART_FRAG_REQ
(
FILE
*
output
,
const
Uint32
*
theData
,
Uint32
len
,
Uint16
recBlockNo
)
{
StartFragReq
*
sig
=
(
StartFragReq
*
)
theData
;
fprintf
(
output
,
" table: %d frag: %d lcpId: %d lcpNo: %d #nodes: %d
\n
"
,
sig
->
tableId
,
sig
->
fragId
,
sig
->
lcpId
,
sig
->
lcpNo
,
sig
->
noOfLogNodes
);
for
(
Uint32
i
=
0
;
i
<
sig
->
noOfLogNodes
;
i
++
)
{
fprintf
(
output
,
" (node: %d startGci: %d lastGci: %d)"
,
sig
->
lqhLogNode
[
i
],
sig
->
startGci
[
i
],
sig
->
lastGci
[
i
]);
}
fprintf
(
output
,
"
\n
"
);
return
true
;
}
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
03f79011
...
...
@@ -9640,6 +9640,9 @@ void Dbdih::execLCP_FRAG_REP(Signal* signal)
}
bool
tableDone
=
reportLcpCompletion
(
lcpReport
);
Uint32
started
=
lcpReport
->
maxGciStarted
;
Uint32
completed
=
lcpReport
->
maxGciCompleted
;
if
(
tableDone
){
jam
();
...
...
@@ -9673,7 +9676,9 @@ void Dbdih::execLCP_FRAG_REP(Signal* signal)
signal
->
theData
[
1
]
=
nodeId
;
signal
->
theData
[
2
]
=
tableId
;
signal
->
theData
[
3
]
=
fragId
;
sendSignal
(
CMVMI_REF
,
GSN_EVENT_REP
,
signal
,
4
,
JBB
);
signal
->
theData
[
4
]
=
started
;
signal
->
theData
[
5
]
=
completed
;
sendSignal
(
CMVMI_REF
,
GSN_EVENT_REP
,
signal
,
6
,
JBB
);
#endif
bool
ok
=
false
;
...
...
@@ -10790,7 +10795,9 @@ void Dbdih::findMinGci(ReplicaRecordPtr fmgReplicaPtr,
lcpNo
=
fmgReplicaPtr
.
p
->
nextLcp
;
do
{
ndbrequire
(
lcpNo
<
MAX_LCP_STORED
);
if
(
fmgReplicaPtr
.
p
->
lcpStatus
[
lcpNo
]
==
ZVALID
)
{
if
(
fmgReplicaPtr
.
p
->
lcpStatus
[
lcpNo
]
==
ZVALID
&&
fmgReplicaPtr
.
p
->
maxGciStarted
[
lcpNo
]
<=
coldgcp
)
{
jam
();
keepGci
=
fmgReplicaPtr
.
p
->
maxGciCompleted
[
lcpNo
];
oldestRestorableGci
=
fmgReplicaPtr
.
p
->
maxGciStarted
[
lcpNo
];
...
...
@@ -10798,7 +10805,6 @@ void Dbdih::findMinGci(ReplicaRecordPtr fmgReplicaPtr,
return
;
}
else
{
jam
();
ndbrequire
(
fmgReplicaPtr
.
p
->
lcpStatus
[
lcpNo
]
==
ZINVALID
);
if
(
fmgReplicaPtr
.
p
->
createGci
[
0
]
==
fmgReplicaPtr
.
p
->
initialGci
)
{
jam
();
/*-------------------------------------------------------------------
...
...
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
View file @
03f79011
...
...
@@ -4404,7 +4404,7 @@ Dbtc::DIVER_node_fail_handling(Signal* signal, UintR Tgci)
*------------------------------------------------------------------------*/
tabortInd
=
ZFALSE
;
setupFailData
(
signal
);
if
(
tabortInd
==
ZFALSE
)
{
if
(
false
&&
tabortInd
==
ZFALSE
)
{
jam
();
commitGciHandling
(
signal
,
Tgci
);
toCommitHandlingLab
(
signal
);
...
...
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