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
80e602f5
Commit
80e602f5
authored
Sep 13, 2004
by
magnus@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added DBUG_PRINT's
Made Ndb::connected private
parent
2e8914cd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
9 deletions
+16
-9
ndb/include/ndbapi/Ndb.hpp
ndb/include/ndbapi/Ndb.hpp
+3
-2
ndb/src/ndbapi/NdbDictionaryImpl.cpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp
+6
-4
ndb/src/ndbapi/TransporterFacade.cpp
ndb/src/ndbapi/TransporterFacade.cpp
+7
-3
No files found.
ndb/include/ndbapi/Ndb.hpp
View file @
80e602f5
...
@@ -1087,8 +1087,6 @@ public:
...
@@ -1087,8 +1087,6 @@ public:
int
waitUntilReady
(
int
timeout
=
60
);
int
waitUntilReady
(
int
timeout
=
60
);
void
connected
(
Uint32
block_reference
);
/** @} *********************************************************************/
/** @} *********************************************************************/
/**
/**
...
@@ -1447,6 +1445,9 @@ private:
...
@@ -1447,6 +1445,9 @@ private:
void
setup
(
Ndb_cluster_connection
*
ndb_cluster_connection
,
void
setup
(
Ndb_cluster_connection
*
ndb_cluster_connection
,
const
char
*
aCatalogName
,
const
char
*
aSchemaName
);
const
char
*
aCatalogName
,
const
char
*
aSchemaName
);
void
connected
(
Uint32
block_reference
);
NdbConnection
*
startTransactionLocal
(
Uint32
aPrio
,
Uint32
aFragmentId
);
NdbConnection
*
startTransactionLocal
(
Uint32
aPrio
,
Uint32
aFragmentId
);
// Connect the connection object to the Database.
// Connect the connection object to the Database.
...
...
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @
80e602f5
...
@@ -815,6 +815,8 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
...
@@ -815,6 +815,8 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
const
int
noerrcodes
,
const
int
noerrcodes
,
const
int
temporaryMask
)
const
int
temporaryMask
)
{
{
DBUG_ENTER
(
"NdbDictInterface::dictSignal"
);
DBUG_PRINT
(
"enter"
,
(
"useMasterNodeId: %d"
,
useMasterNodeId
));
for
(
Uint32
i
=
0
;
i
<
RETRIES
;
i
++
){
for
(
Uint32
i
=
0
;
i
<
RETRIES
;
i
++
){
//if (useMasterNodeId == 0)
//if (useMasterNodeId == 0)
m_buffer
.
clear
();
m_buffer
.
clear
();
...
@@ -834,7 +836,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
...
@@ -834,7 +836,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
if
(
aNodeId
==
0
){
if
(
aNodeId
==
0
){
m_error
.
code
=
4009
;
m_error
.
code
=
4009
;
m_transporter
->
unlock_mutex
();
m_transporter
->
unlock_mutex
();
return
-
1
;
DBUG_RETURN
(
-
1
)
;
}
}
{
{
int
r
;
int
r
;
...
@@ -870,7 +872,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
...
@@ -870,7 +872,7 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
if
(
m_waiter
.
m_state
==
NO_WAIT
&&
m_error
.
code
==
0
){
if
(
m_waiter
.
m_state
==
NO_WAIT
&&
m_error
.
code
==
0
){
// Normal return
// Normal return
return
0
;
DBUG_RETURN
(
0
)
;
}
}
/**
/**
...
@@ -893,9 +895,9 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
...
@@ -893,9 +895,9 @@ NdbDictInterface::dictSignal(NdbApiSignal* signal,
continue
;
continue
;
}
}
return
-
1
;
DBUG_RETURN
(
-
1
)
;
}
}
return
-
1
;
DBUG_RETURN
(
-
1
);
}
}
/*****************************************************************
/*****************************************************************
...
...
ndb/src/ndbapi/TransporterFacade.cpp
View file @
80e602f5
...
@@ -944,6 +944,8 @@ TransporterFacade::isConnected(NodeId aNodeId){
...
@@ -944,6 +944,8 @@ TransporterFacade::isConnected(NodeId aNodeId){
NodeId
NodeId
TransporterFacade
::
get_an_alive_node
()
TransporterFacade
::
get_an_alive_node
()
{
{
DBUG_ENTER
(
"TransporterFacade::get_an_alive_node"
);
DBUG_PRINT
(
"enter"
,
(
"theStartNodeId: %d"
,
theStartNodeId
));
#ifdef VM_TRACE
#ifdef VM_TRACE
const
char
*
p
=
NdbEnv_GetEnv
(
"NDB_ALIVE_NODE_ID"
,
(
char
*
)
0
,
0
);
const
char
*
p
=
NdbEnv_GetEnv
(
"NDB_ALIVE_NODE_ID"
,
(
char
*
)
0
,
0
);
if
(
p
!=
0
&&
*
p
!=
0
)
if
(
p
!=
0
&&
*
p
!=
0
)
...
@@ -952,17 +954,19 @@ TransporterFacade::get_an_alive_node()
...
@@ -952,17 +954,19 @@ TransporterFacade::get_an_alive_node()
NodeId
i
;
NodeId
i
;
for
(
i
=
theStartNodeId
;
i
<
MAX_NDB_NODES
;
i
++
)
{
for
(
i
=
theStartNodeId
;
i
<
MAX_NDB_NODES
;
i
++
)
{
if
(
get_node_alive
(
i
)){
if
(
get_node_alive
(
i
)){
DBUG_PRINT
(
"info"
,
(
"Node %d is alive"
,
i
));
theStartNodeId
=
((
i
+
1
)
%
MAX_NDB_NODES
);
theStartNodeId
=
((
i
+
1
)
%
MAX_NDB_NODES
);
return
i
;
DBUG_RETURN
(
i
)
;
}
}
}
}
for
(
i
=
1
;
i
<
theStartNodeId
;
i
++
)
{
for
(
i
=
1
;
i
<
theStartNodeId
;
i
++
)
{
if
(
get_node_alive
(
i
)){
if
(
get_node_alive
(
i
)){
DBUG_PRINT
(
"info"
,
(
"Node %d is alive"
,
i
));
theStartNodeId
=
((
i
+
1
)
%
MAX_NDB_NODES
);
theStartNodeId
=
((
i
+
1
)
%
MAX_NDB_NODES
);
return
i
;
DBUG_RETURN
(
i
)
;
}
}
}
}
return
(
NodeId
)
0
;
DBUG_RETURN
((
NodeId
)
0
)
;
}
}
TransporterFacade
::
ThreadData
::
ThreadData
(
Uint32
size
){
TransporterFacade
::
ThreadData
::
ThreadData
(
Uint32
size
){
...
...
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