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
8d0275b3
Commit
8d0275b3
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents
593f03d9
4ce2977b
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
+2
-2
ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
+2
-2
ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
...c/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
+11
-0
No files found.
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
View file @
8d0275b3
...
...
@@ -79,6 +79,7 @@ NdbOut& operator<<(NdbOut& no, const CommitTransactionRecord& ctr) {
no
<<
"----------COMMIT TRANSACTION RECORD------------"
<<
endl
<<
endl
;
printOut
(
"Record type:"
,
ctr
.
m_recordType
);
printOut
(
"TableId"
,
ctr
.
m_tableId
);
printOut
(
"SchemaVersion:"
,
ctr
.
m_schemaVersion
);
printOut
(
"FfragmentId"
,
ctr
.
m_fragmentId
);
printOut
(
"File no. of Prep. Op."
,
ctr
.
m_fileNumberOfPrepareOperation
);
printOut
(
"Start page no. of Prep. Op."
,
ctr
.
m_startPageNumberOfPrepareOperation
);
...
...
@@ -127,7 +128,7 @@ bool PrepareOperationRecord::check() {
if
(
m_operationType
==
3
&&
m_attributeLength
!=
0
)
return
false
;
if
(
m_logRecordSize
!=
(
m_attributeLength
+
m_keyLength
+
7
))
if
(
m_logRecordSize
!=
(
m_attributeLength
+
m_keyLength
+
6
))
return
false
;
return
true
;
...
...
@@ -142,7 +143,6 @@ NdbOut& operator<<(NdbOut& no, const PrepareOperationRecord& por) {
printOut
(
"Record type:"
,
por
.
m_recordType
);
printOut
(
"logRecordSize:"
,
por
.
m_logRecordSize
);
printOut
(
"hashValue:"
,
por
.
m_hashValue
);
printOut
(
"schemaVersion:"
,
por
.
m_schemaVersion
);
switch
(
por
.
m_operationType
)
{
case
0
:
ndbout_c
(
"%-30s%-12u%-6s"
,
"operationType:"
,
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
View file @
8d0275b3
...
...
@@ -36,7 +36,7 @@
#define NO_PAGES_IN_MBYTE 32
#define NO_MBYTE_IN_FILE 16
#define COMMITTRANSACTIONRECORDSIZE
8
#define COMMITTRANSACTIONRECORDSIZE
9
#define COMPLETEDGCIRECORDSIZE 2
#define PAGEHEADERSIZE 32
#define FILEDESCRIPTORHEADERSIZE 3
...
...
@@ -89,7 +89,6 @@ protected:
Uint32
m_recordType
;
Uint32
m_logRecordSize
;
Uint32
m_hashValue
;
Uint32
m_schemaVersion
;
Uint32
m_operationType
;
// 0 READ, 1 UPDATE, 2 INSERT, 3 DELETE
Uint32
m_attributeLength
;
Uint32
m_keyLength
;
...
...
@@ -190,6 +189,7 @@ public:
protected:
Uint32
m_recordType
;
Uint32
m_tableId
;
Uint32
m_schemaVersion
;
Uint32
m_fragmentId
;
Uint32
m_fileNumberOfPrepareOperation
;
Uint32
m_startPageNumberOfPrepareOperation
;
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
View file @
8d0275b3
...
...
@@ -105,6 +105,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
thePageHeader
);
if
(
theCheckFlag
)
{
if
(
!
thePageHeader
->
check
())
{
ndbout
<<
"Error in thePageHeader->check()"
<<
endl
;
doExit
();
}
...
...
@@ -146,6 +147,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
fdRecord
);
if
(
theCheckFlag
)
{
if
(
!
fdRecord
->
check
())
{
ndbout
<<
"Error in fdRecord->check()"
<<
endl
;
doExit
();
}
}
...
...
@@ -163,6 +165,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
nlRecord
);
if
(
theCheckFlag
)
{
if
(
!
nlRecord
->
check
())
{
ndbout
<<
"Error in nlRecord->check()"
<<
endl
;
doExit
();
}
}
...
...
@@ -176,6 +179,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
cGCIrecord
);
if
(
theCheckFlag
)
{
if
(
!
cGCIrecord
->
check
())
{
ndbout
<<
"Error in cGCIrecord->check()"
<<
endl
;
doExit
();
}
}
...
...
@@ -189,6 +193,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
poRecord
);
if
(
theCheckFlag
)
{
if
(
!
poRecord
->
check
())
{
ndbout
<<
"Error in poRecord->check()"
<<
endl
;
doExit
();
}
}
...
...
@@ -205,6 +210,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
ctRecord
);
if
(
theCheckFlag
)
{
if
(
!
ctRecord
->
check
())
{
ndbout
<<
"Error in ctRecord->check()"
<<
endl
;
doExit
();
}
}
...
...
@@ -221,6 +227,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
ictRecord
);
if
(
theCheckFlag
)
{
if
(
!
ictRecord
->
check
())
{
ndbout
<<
"Error in ictRecord->check()"
<<
endl
;
doExit
();
}
}
...
...
@@ -243,6 +250,7 @@ NDB_COMMAND(redoLogFileReader, "redoLogFileReader", "redoLogFileReader", "Read
if
(
thePrintFlag
)
ndbout
<<
(
*
atRecord
);
if
(
theCheckFlag
)
{
if
(
!
atRecord
->
check
())
{
ndbout
<<
"Error in atRecord->check()"
<<
endl
;
doExit
();
}
}
...
...
@@ -329,6 +337,7 @@ Uint32 readRecordOverPageBoundary(Uint32 *pagePtr, Uint32 pageIndex, Uint32 old
if
(
recordSize
<
(
PAGESIZE
-
PAGEHEADERSIZE
))
{
if
(
theCheckFlag
)
{
if
(
!
poRecord
->
check
())
{
ndbout
<<
"Error in poRecord->check() (readRecordOverPageBoundary)"
<<
endl
;
doExit
();
}
}
...
...
@@ -344,6 +353,7 @@ Uint32 readRecordOverPageBoundary(Uint32 *pagePtr, Uint32 pageIndex, Uint32 old
if
(
recordSize
<
(
PAGESIZE
-
PAGEHEADERSIZE
))
{
if
(
theCheckFlag
)
{
if
(
!
ctRecord
->
check
())
{
ndbout
<<
"Error in ctRecord->check() (readRecordOverPageBoundary)"
<<
endl
;
doExit
();
}
}
...
...
@@ -359,6 +369,7 @@ Uint32 readRecordOverPageBoundary(Uint32 *pagePtr, Uint32 pageIndex, Uint32 old
if
(
recordSize
<
(
PAGESIZE
-
PAGEHEADERSIZE
))
{
if
(
theCheckFlag
)
{
if
(
!
ictRecord
->
check
())
{
ndbout
<<
"Error in ictRecord->check() (readRecordOverPageBoundary)"
<<
endl
;
doExit
();
}
}
...
...
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