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
358ba900
Commit
358ba900
authored
Mar 03, 2005
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated example makefiles to add libmystrings
temporary added trace printouts for ndb autotest
parent
34c5892c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
31 additions
and
16 deletions
+31
-16
ndb/ndbapi-examples/ndbapi_async_example/Makefile
ndb/ndbapi-examples/ndbapi_async_example/Makefile
+2
-2
ndb/ndbapi-examples/ndbapi_async_example1/Makefile
ndb/ndbapi-examples/ndbapi_async_example1/Makefile
+2
-2
ndb/ndbapi-examples/ndbapi_event_example/Makefile
ndb/ndbapi-examples/ndbapi_event_example/Makefile
+2
-2
ndb/ndbapi-examples/ndbapi_retries_example/Makefile
ndb/ndbapi-examples/ndbapi_retries_example/Makefile
+2
-2
ndb/ndbapi-examples/ndbapi_scan_example/Makefile
ndb/ndbapi-examples/ndbapi_scan_example/Makefile
+2
-2
ndb/ndbapi-examples/ndbapi_simple_example/Makefile
ndb/ndbapi-examples/ndbapi_simple_example/Makefile
+2
-2
ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
+2
-2
ndb/src/common/transporter/TransporterRegistry.cpp
ndb/src/common/transporter/TransporterRegistry.cpp
+17
-2
No files found.
ndb/ndbapi-examples/ndbapi_async_example/Makefile
View file @
358ba900
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
INCLUDE_DIR
=
$(TOP_SRCDIR)
INCLUDE_DIR
=
$(TOP_SRCDIR)
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/strings
SYS_LIB
=
SYS_LIB
=
$(TARGET)
:
$(OBJS)
$(TARGET)
:
$(OBJS)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-lz
$(SYS_LIB)
-o
$(TARGET)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-l
mystrings
-l
z
$(SYS_LIB)
-o
$(TARGET)
$(TARGET).o
:
$(SRCS)
$(TARGET).o
:
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/extra
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/extra
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
...
...
ndb/ndbapi-examples/ndbapi_async_example1/Makefile
View file @
358ba900
...
@@ -8,11 +8,11 @@ LFLAGS = -Wall
...
@@ -8,11 +8,11 @@ LFLAGS = -Wall
INCLUDE_DIR
=
../../include
INCLUDE_DIR
=
../../include
LIB_DIR
=
-L
../../src/.libs
\
LIB_DIR
=
-L
../../src/.libs
\
-L
../../../libmysql_r/.libs
\
-L
../../../libmysql_r/.libs
\
-L
../../../mysys
-L
../../../mysys
-L
../../../strings
SYS_LIB
=
SYS_LIB
=
$(TARGET)
:
$(OBJS)
$(TARGET)
:
$(OBJS)
$(CXX)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-lz
$(SYS_LIB)
-o
$(TARGET)
$(CXX)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-l
mystrings
-l
z
$(SYS_LIB)
-o
$(TARGET)
$(TARGET).o
:
$(SRCS)
$(TARGET).o
:
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
-I
$(INCLUDE_DIR)
/ndbapi
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
-I
$(INCLUDE_DIR)
/ndbapi
$(SRCS)
...
...
ndb/ndbapi-examples/ndbapi_event_example/Makefile
View file @
358ba900
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
INCLUDE_DIR
=
$(TOP_SRCDIR)
/ndb/include
INCLUDE_DIR
=
$(TOP_SRCDIR)
/ndb/include
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/strings
SYS_LIB
=
SYS_LIB
=
$(TARGET)
:
$(OBJS)
$(TARGET)
:
$(OBJS)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-lz
$(SYS_LIB)
-o
$(TARGET)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-l
mystrings
-l
z
$(SYS_LIB)
-o
$(TARGET)
$(TARGET).o
:
$(SRCS)
$(TARGET).o
:
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
-I
$(INCLUDE_DIR)
/ndbapi
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
-I
$(INCLUDE_DIR)
/ndbapi
$(SRCS)
...
...
ndb/ndbapi-examples/ndbapi_retries_example/Makefile
View file @
358ba900
...
@@ -8,11 +8,11 @@ LFLAGS = -Wall
...
@@ -8,11 +8,11 @@ LFLAGS = -Wall
INCLUDE_DIR
=
../../include
INCLUDE_DIR
=
../../include
LIB_DIR
=
-L
../../src/.libs
\
LIB_DIR
=
-L
../../src/.libs
\
-L
../../../libmysql_r/.libs
\
-L
../../../libmysql_r/.libs
\
-L
../../../mysys
-L
../../../mysys
-L
../../../strings
SYS_LIB
=
SYS_LIB
=
$(TARGET)
:
$(OBJS)
$(TARGET)
:
$(OBJS)
$(CXX)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-lz
$(SYS_LIB)
-o
$(TARGET)
$(CXX)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-l
mystrings
-l
z
$(SYS_LIB)
-o
$(TARGET)
$(TARGET).o
:
$(SRCS)
$(TARGET).o
:
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
-I
$(INCLUDE_DIR)
/ndbapi
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
-I
$(INCLUDE_DIR)
/ndbapi
$(SRCS)
...
...
ndb/ndbapi-examples/ndbapi_scan_example/Makefile
View file @
358ba900
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
INCLUDE_DIR
=
$(TOP_SRCDIR)
INCLUDE_DIR
=
$(TOP_SRCDIR)
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/strings
SYS_LIB
=
SYS_LIB
=
$(TARGET)
:
$(OBJS)
$(TARGET)
:
$(OBJS)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-lz
$(SYS_LIB)
-o
$(TARGET)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-l
mystrings
-l
z
$(SYS_LIB)
-o
$(TARGET)
$(TARGET).o
:
$(SRCS)
$(TARGET).o
:
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/extra
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/extra
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
...
...
ndb/ndbapi-examples/ndbapi_simple_example/Makefile
View file @
358ba900
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
INCLUDE_DIR
=
$(TOP_SRCDIR)
INCLUDE_DIR
=
$(TOP_SRCDIR)
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/strings
SYS_LIB
=
SYS_LIB
=
$(TARGET)
:
$(OBJS)
$(TARGET)
:
$(OBJS)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-lz
$(SYS_LIB)
-o
$(TARGET)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-l
mystrings
-l
z
$(SYS_LIB)
-o
$(TARGET)
$(TARGET).o
:
$(SRCS)
$(TARGET).o
:
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
...
...
ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
View file @
358ba900
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
...
@@ -10,11 +10,11 @@ TOP_SRCDIR = ../../..
INCLUDE_DIR
=
$(TOP_SRCDIR)
INCLUDE_DIR
=
$(TOP_SRCDIR)
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
LIB_DIR
=
-L
$(TOP_SRCDIR)
/ndb/src/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/libmysql_r/.libs
\
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/mysys
-L
$(TOP_SRCDIR)
/strings
SYS_LIB
=
SYS_LIB
=
$(TARGET)
:
$(OBJS)
$(TARGET)
:
$(OBJS)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-lz
$(SYS_LIB)
-o
$(TARGET)
$(CXX)
$(CXXFLAGS)
$(LFLAGS)
$(LIB_DIR)
$(OBJS)
-lndbclient
-lmysqlclient_r
-lmysys
-l
mystrings
-l
z
$(SYS_LIB)
-o
$(TARGET)
$(TARGET).o
:
$(SRCS)
$(TARGET).o
:
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
$(CXX)
$(CFLAGS)
-I
$(INCLUDE_DIR)
/include
-I
$(INCLUDE_DIR)
/ndb/include
-I
$(INCLUDE_DIR)
/ndb/include/ndbapi
$(SRCS)
...
...
ndb/src/common/transporter/TransporterRegistry.cpp
View file @
358ba900
...
@@ -1531,12 +1531,16 @@ bool TransporterRegistry::connect_client(NdbMgmHandle *h)
...
@@ -1531,12 +1531,16 @@ bool TransporterRegistry::connect_client(NdbMgmHandle *h)
Uint32
mgm_nodeid
=
ndb_mgm_get_mgmd_nodeid
(
*
h
);
Uint32
mgm_nodeid
=
ndb_mgm_get_mgmd_nodeid
(
*
h
);
if
(
!
mgm_nodeid
)
if
(
!
mgm_nodeid
)
{
ndbout_c
(
"%s: %d"
,
__FILE__
,
__LINE__
);
return
false
;
return
false
;
}
Transporter
*
t
=
theTransporters
[
mgm_nodeid
];
Transporter
*
t
=
theTransporters
[
mgm_nodeid
];
if
(
!
t
)
if
(
!
t
)
{
ndbout_c
(
"%s: %d"
,
__FILE__
,
__LINE__
);
return
false
;
return
false
;
}
DBUG_RETURN
(
t
->
connect_client
(
connect_ndb_mgmd
(
h
)));
DBUG_RETURN
(
t
->
connect_client
(
connect_ndb_mgmd
(
h
)));
}
}
...
@@ -1550,6 +1554,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
...
@@ -1550,6 +1554,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
if
(
h
==
NULL
||
*
h
==
NULL
)
if
(
h
==
NULL
||
*
h
==
NULL
)
{
{
ndbout_c
(
"%s: %d"
,
__FILE__
,
__LINE__
);
return
NDB_INVALID_SOCKET
;
return
NDB_INVALID_SOCKET
;
}
}
...
@@ -1562,6 +1567,10 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
...
@@ -1562,6 +1567,10 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
m_transporter_interface
[
i
].
m_s_service_port
,
m_transporter_interface
[
i
].
m_s_service_port
,
&
mgm_reply
)
<
0
)
&
mgm_reply
)
<
0
)
{
{
ndbout_c
(
"Error: %s: %d"
,
ndb_mgm_get_latest_error_desc
(
*
h
),
ndb_mgm_get_latest_error
(
*
h
));
ndbout_c
(
"%s: %d"
,
__FILE__
,
__LINE__
);
ndb_mgm_destroy_handle
(
h
);
ndb_mgm_destroy_handle
(
h
);
return
NDB_INVALID_SOCKET
;
return
NDB_INVALID_SOCKET
;
}
}
...
@@ -1572,7 +1581,13 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
...
@@ -1572,7 +1581,13 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle *h)
*/
*/
NDB_SOCKET_TYPE
sockfd
=
ndb_mgm_convert_to_transporter
(
h
);
NDB_SOCKET_TYPE
sockfd
=
ndb_mgm_convert_to_transporter
(
h
);
if
(
sockfd
==
NDB_INVALID_SOCKET
)
if
(
sockfd
==
NDB_INVALID_SOCKET
)
{
ndbout_c
(
"Error: %s: %d"
,
ndb_mgm_get_latest_error_desc
(
*
h
),
ndb_mgm_get_latest_error
(
*
h
));
ndbout_c
(
"%s: %d"
,
__FILE__
,
__LINE__
);
ndb_mgm_destroy_handle
(
h
);
ndb_mgm_destroy_handle
(
h
);
}
return
sockfd
;
return
sockfd
;
}
}
...
...
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