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
df09a0ce
Commit
df09a0ce
authored
Apr 07, 2006
by
joerg@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Manual merge.
parents
85ff7bec
7e4d41de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+2
-3
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+10
-0
No files found.
mysql-test/lib/mtr_process.pl
View file @
df09a0ce
...
...
@@ -465,8 +465,7 @@ sub mtr_kill_leftovers () {
if
(
kill
(
0
,
@pids
)
)
# Check if some left
{
# FIXME maybe just mtr_warning() ?
mtr_error
("
can't kill process(es)
"
.
join
("
",
@pids
));
mtr_warning
("
can't kill process(es)
"
.
join
("
",
@pids
));
}
}
}
...
...
@@ -479,7 +478,7 @@ sub mtr_kill_leftovers () {
{
if
(
mtr_ping_mysqld_server
(
$srv
->
{'
port
'},
$srv
->
{'
sockfile
'})
)
{
mtr_
error
("
can't kill old mysqld holding port
$srv
->{'port'}
");
mtr_
warning
("
can't kill old mysqld holding port
$srv
->{'port'}
");
}
}
}
...
...
mysql-test/mysql-test-run.sh
View file @
df09a0ce
...
...
@@ -277,6 +277,7 @@ EXTRA_MYSQLSHOW_OPT=""
EXTRA_MYSQLBINLOG_OPT
=
""
USE_RUNNING_SERVER
=
0
USE_NDBCLUSTER
=
@USE_NDBCLUSTER@
USE_NDBCLUSTER_ONLY
=
0
USE_RUNNING_NDBCLUSTER
=
""
USE_PURIFY
=
""
PURIFY_LOGS
=
""
...
...
@@ -341,6 +342,10 @@ while test $# -gt 0; do
--extern
)
USE_RUNNING_SERVER
=
1
;;
--with-ndbcluster
)
USE_NDBCLUSTER
=
"--ndbcluster"
;;
--with-ndbcluster-only
)
USE_NDBCLUSTER
=
"--ndbcluster"
USE_NDBCLUSTER_SLAVE
=
"--ndbcluster"
USE_NDBCLUSTER_ONLY
=
1
;;
--ndb-connectstring
=
*
)
USE_NDBCLUSTER
=
"--ndbcluster"
;
USE_RUNNING_NDBCLUSTER
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--ndb-connectstring=;;"
`
;;
...
...
@@ -1654,6 +1659,11 @@ run_testcase ()
result_file
=
"r/
$tname
.result"
echo
$tname
>
$CURRENT_TEST
SKIP_SLAVE
=
`
$EXPR
\(
$tname
: rpl
\)
=
0
\&
\(
$tname
: federated
\)
=
0
`
NDBCLUSTER_TEST
=
`
$EXPR
\(
$tname
:
'.*ndb.*'
\)
!=
0
`
if
[
"x
$USE_NDBCLUSTER_ONLY
"
=
"x1"
-a
"x
$NDBCLUSTER_TEST
"
!=
"x1"
]
;
then
skip_test
$tname
return
fi
if
[
"
$USE_MANAGER
"
=
1
]
;
then
many_slaves
=
`
$EXPR
\(
\(
$tname
: rpl_failsafe
\)
!=
0
\)
\|
\(
\(
$tname
: rpl_chain_temp_table
\)
!=
0
\)
`
fi
...
...
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