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
ad7d5bbd
Commit
ad7d5bbd
authored
Jul 07, 2004
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wl1292 - minor fixes
parent
9d72e8e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
ndb/test/run-test/main.cpp
ndb/test/run-test/main.cpp
+9
-6
No files found.
ndb/test/run-test/main.cpp
View file @
ad7d5bbd
...
@@ -211,7 +211,7 @@ started:
...
@@ -211,7 +211,7 @@ started:
(
result
==
0
?
"OK"
:
"FAILED"
),
result
);
(
result
==
0
?
"OK"
:
"FAILED"
),
result
);
if
(
g_report_file
!=
0
){
if
(
g_report_file
!=
0
){
fprintf
(
g_report_file
,
"%s %s ; %d ; %d ; %d
\n
"
,
fprintf
(
g_report_file
,
"%s %s ; %d ; %d ; %
l
d
\n
"
,
test_case
.
m_command
.
c_str
(),
test_case
.
m_command
.
c_str
(),
test_case
.
m_args
.
c_str
(),
test_case
.
m_args
.
c_str
(),
test_no
,
result
,
elapsed
);
test_no
,
result
,
elapsed
);
...
@@ -447,7 +447,6 @@ setup_config(atrt_config& config){
...
@@ -447,7 +447,6 @@ setup_config(atrt_config& config){
proc
.
m_proc
.
m_owner
=
"atrt"
;
proc
.
m_proc
.
m_owner
=
"atrt"
;
proc
.
m_proc
.
m_group
=
"group"
;
proc
.
m_proc
.
m_group
=
"group"
;
proc
.
m_proc
.
m_cwd
.
assign
(
dir
).
append
(
"/run/"
);
proc
.
m_proc
.
m_cwd
.
assign
(
dir
).
append
(
"/run/"
);
proc
.
m_proc
.
m_env
.
assfmt
(
"LD_LIBRARY_PATH=%s/lib/mysql"
,
dir
.
c_str
());
proc
.
m_proc
.
m_stdout
=
"log.out"
;
proc
.
m_proc
.
m_stdout
=
"log.out"
;
proc
.
m_proc
.
m_stderr
=
"2>&1"
;
proc
.
m_proc
.
m_stderr
=
"2>&1"
;
proc
.
m_proc
.
m_runas
=
proc
.
m_host
->
m_user
;
proc
.
m_proc
.
m_runas
=
proc
.
m_host
->
m_user
;
...
@@ -460,7 +459,7 @@ setup_config(atrt_config& config){
...
@@ -460,7 +459,7 @@ setup_config(atrt_config& config){
proc
.
m_proc
.
m_path
.
assign
(
dir
).
append
(
"/libexec/ndb_mgmd"
);
proc
.
m_proc
.
m_path
.
assign
(
dir
).
append
(
"/libexec/ndb_mgmd"
);
proc
.
m_proc
.
m_args
=
"-n -c initconfig.txt"
;
proc
.
m_proc
.
m_args
=
"-n -c initconfig.txt"
;
proc
.
m_proc
.
m_cwd
.
appfmt
(
"%d.ndb_mgmd"
,
index
);
proc
.
m_proc
.
m_cwd
.
appfmt
(
"%d.ndb_mgmd"
,
index
);
connect_string
.
appfmt
(
"
;host=%s:%d
"
,
connect_string
.
appfmt
(
"
host=%s:%d;
"
,
proc
.
m_hostname
.
c_str
(),
proc
.
m_ndb_mgm_port
);
proc
.
m_hostname
.
c_str
(),
proc
.
m_ndb_mgm_port
);
}
else
if
(
split1
[
0
]
==
"ndb"
){
}
else
if
(
split1
[
0
]
==
"ndb"
){
proc
.
m_type
=
atrt_process
::
NDB_DB
;
proc
.
m_type
=
atrt_process
::
NDB_DB
;
...
@@ -502,10 +501,10 @@ setup_config(atrt_config& config){
...
@@ -502,10 +501,10 @@ setup_config(atrt_config& config){
// Setup connect string
// Setup connect string
for
(
size_t
i
=
0
;
i
<
config
.
m_processes
.
size
();
i
++
){
for
(
size_t
i
=
0
;
i
<
config
.
m_processes
.
size
();
i
++
){
config
.
m_processes
[
i
].
m_proc
.
m_env
.
a
ppfmt
(
" NDB_CONNECTSTRING=nodeid=%d
%s"
,
config
.
m_processes
[
i
].
m_proc
.
m_env
.
a
ssfmt
(
"NDB_CONNECTSTRING=
%s"
,
i
+
1
,
connect_string
.
c_str
());
connect_string
.
c_str
());
}
}
end:
end:
fclose
(
f
);
fclose
(
f
);
return
result
;
return
result
;
...
@@ -791,6 +790,10 @@ update_status(atrt_config& config, int){
...
@@ -791,6 +790,10 @@ update_status(atrt_config& config, int){
proc
.
m_proc
.
m_id
,
proc
.
m_proc
.
m_id
,
proc
.
m_hostname
.
c_str
(),
proc
.
m_hostname
.
c_str
(),
proc
.
m_proc
.
m_path
.
c_str
());
proc
.
m_proc
.
m_path
.
c_str
());
for
(
size_t
j
=
0
;
j
<
h_procs
.
size
();
j
++
){
g_logger
.
error
(
"found: %d %s"
,
h_procs
[
j
].
m_id
,
h_procs
[
j
].
m_path
.
c_str
());
}
return
false
;
return
false
;
}
}
}
}
...
...
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