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
e8b0b313
Commit
e8b0b313
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
parents
406a7ba9
d6b48592
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
ndb/src/common/transporter/TransporterRegistry.cpp
ndb/src/common/transporter/TransporterRegistry.cpp
+1
-1
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+1
-1
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+2
-1
ndb/src/kernel/error/ndbd_exit_codes.c
ndb/src/kernel/error/ndbd_exit_codes.c
+4
-3
ndb/src/ndbapi/ndberror.c
ndb/src/ndbapi/ndberror.c
+1
-0
No files found.
ndb/src/common/transporter/TransporterRegistry.cpp
View file @
e8b0b313
...
...
@@ -1322,7 +1322,7 @@ TransporterRegistry::start_clients_thread()
else
{
ndbout_c
(
"Management server closed connection early. "
"It is probably being shut down (or has
crashed
). "
"It is probably being shut down (or has
problems
). "
"We will retry the connection."
);
}
}
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
e8b0b313
...
...
@@ -8354,7 +8354,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){
*--------_----------------------------------------------------- */
const
Uint32
nextCrashed
=
noCrashedReplicas
+
1
;
replicaPtr
.
p
->
noCrashedReplicas
=
nextCrashed
;
arrGuard
(
nextCrashed
,
8
);
arrGuard
Err
(
nextCrashed
,
8
,
NDBD_EXIT_MAX_CRASHED_REPLICAS
);
replicaPtr
.
p
->
createGci
[
nextCrashed
]
=
newestRestorableGCI
+
1
;
ndbrequire
(
newestRestorableGCI
+
1
!=
0xF1F1F1F1
);
replicaPtr
.
p
->
replicaLastGci
[
nextCrashed
]
=
(
Uint32
)
-
1
;
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file @
e8b0b313
...
...
@@ -17989,7 +17989,8 @@ void Dblqh::stepAhead(Signal* signal, Uint32 stepAheadWords)
logFilePtr
.
p
->
currentLogpage
=
logPagePtr
.
p
->
logPageWord
[
ZNEXT_PAGE
];
logPagePtr
.
i
=
logPagePtr
.
p
->
logPageWord
[
ZNEXT_PAGE
];
logFilePtr
.
p
->
currentFilepage
++
;
ptrCheckGuard
(
logPagePtr
,
clogPageFileSize
,
logPageRecord
);
ptrCheckGuardErr
(
logPagePtr
,
clogPageFileSize
,
logPageRecord
,
NDBD_EXIT_SR_REDOLOG
);
logPagePtr
.
p
->
logPageWord
[
ZCURR_PAGE_INDEX
]
=
ZPAGE_HEADER_SIZE
;
logPartPtr
.
p
->
execSrPagesRead
--
;
logPartPtr
.
p
->
execSrPagesExecuted
++
;
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/error/ndbd_exit_codes.c
View file @
e8b0b313
...
...
@@ -51,8 +51,9 @@ static const ErrStruct errArray[] =
{
NDBD_EXIT_SYSTEM_ERROR
,
XIE
,
"System error, node killed during node restart by other node"
},
{
NDBD_EXIT_INDEX_NOTINRANGE
,
XIE
,
"Array index out of range"
},
{
NDBD_EXIT_ARBIT_SHUTDOWN
,
XAE
,
"Arbitrator shutdown, "
"please investigate error(s) on other node(s)"
},
{
NDBD_EXIT_ARBIT_SHUTDOWN
,
XAE
,
"Node lost connection to other nodes and "
"can not form a unpartitioned cluster, please investigate if there are "
"error(s) on other node(s)"
},
{
NDBD_EXIT_POINTER_NOTINRANGE
,
XIE
,
"Pointer too large"
},
{
NDBD_EXIT_SR_OTHERNODEFAILED
,
XRE
,
"Another node failed during system "
"restart, please investigate error(s) on other node(s)"
},
...
...
@@ -94,7 +95,7 @@ static const ErrStruct errArray[] =
{
NDBD_EXIT_WATCHDOG_TERMINATE
,
XIE
,
"WatchDog terminate, internal error "
"or massive overload on the machine running this node"
},
{
NDBD_EXIT_SIGNAL_LOST_SEND_BUFFER_FULL
,
XCR
,
"Signal lost, out of send buffer memory, please increase SendBufferMemory"
},
"Signal lost, out of send buffer memory, please increase SendBufferMemory
or lower the load
"
},
{
NDBD_EXIT_SIGNAL_LOST
,
XIE
,
"Signal lost (unknown reason)"
},
{
NDBD_EXIT_ILLEGAL_SIGNAL
,
XIE
,
"Illegal signal (version mismatch a possibility)"
},
...
...
This diff is collapsed.
Click to expand it.
ndb/src/ndbapi/ndberror.c
View file @
e8b0b313
...
...
@@ -266,6 +266,7 @@ ErrorBundle ErrorCodes[] = {
/**
* Application error
*/
{
763
,
AE
,
"Alter table requires cluster nodes to have exact same version"
},
{
823
,
AE
,
"Too much attrinfo from application in tuple manager"
},
{
831
,
AE
,
"Too many nullable/bitfields in table definition"
},
{
876
,
AE
,
"876"
},
...
...
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