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
cdce8b10
Commit
cdce8b10
authored
Aug 01, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
parents
d8d17559
92581183
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+14
-5
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+1
-3
No files found.
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
cdce8b10
...
...
@@ -8252,11 +8252,20 @@ void Dbdih::openingTableErrorLab(Signal* signal, FileRecordPtr filePtr)
/* WE FAILED IN OPENING A FILE. IF THE FIRST FILE THEN TRY WITH THE */
/* DUPLICATE FILE, OTHERWISE WE REPORT AN ERROR IN THE SYSTEM RESTART. */
/* ---------------------------------------------------------------------- */
ndbrequire
(
filePtr
.
i
==
tabPtr
.
p
->
tabFile
[
0
]);
filePtr
.
i
=
tabPtr
.
p
->
tabFile
[
1
];
ptrCheckGuard
(
filePtr
,
cfileFileSize
,
fileRecord
);
openFileRw
(
signal
,
filePtr
);
filePtr
.
p
->
reqStatus
=
FileRecord
::
OPENING_TABLE
;
if
(
filePtr
.
i
==
tabPtr
.
p
->
tabFile
[
0
])
{
filePtr
.
i
=
tabPtr
.
p
->
tabFile
[
1
];
ptrCheckGuard
(
filePtr
,
cfileFileSize
,
fileRecord
);
openFileRw
(
signal
,
filePtr
);
filePtr
.
p
->
reqStatus
=
FileRecord
::
OPENING_TABLE
;
}
else
{
char
buf
[
256
];
BaseString
::
snprintf
(
buf
,
"Error opening DIH schema files for table: %d"
,
tabPtr
.
i
);
progError
(
__LINE__
,
NDBD_EXIT_AFS_NO_SUCH_FILE
,
buf
);
}
}
//Dbdih::openingTableErrorLab()
void
Dbdih
::
readingTableLab
(
Signal
*
signal
,
FileRecordPtr
filePtr
)
...
...
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file @
cdce8b10
...
...
@@ -12579,19 +12579,17 @@ void Dblqh::lastWriteInFileLab(Signal* signal)
void
Dblqh
::
writePageZeroLab
(
Signal
*
signal
)
{
if
(
false
&&
logPartPtr
.
p
->
logPartState
==
LogPartRecord
::
FILE_CHANGE_PROBLEM
)
if
(
logPartPtr
.
p
->
logPartState
==
LogPartRecord
::
FILE_CHANGE_PROBLEM
)
{
if
(
logPartPtr
.
p
->
firstLogQueue
==
RNIL
)
{
jam
();
logPartPtr
.
p
->
logPartState
=
LogPartRecord
::
IDLE
;
ndbout_c
(
"resetting logPartState to IDLE"
);
}
else
{
jam
();
logPartPtr
.
p
->
logPartState
=
LogPartRecord
::
ACTIVE
;
ndbout_c
(
"resetting logPartState to ACTIVE"
);
}
}
...
...
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