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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fb3b7682
Commit
fb3b7682
authored
Apr 07, 2006
by
igor@rurik.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
parents
f053b7c9
a0c3f51c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+2
-3
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+9
-0
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+12
-0
No files found.
mysql-test/lib/mtr_process.pl
View file @
fb3b7682
...
@@ -465,8 +465,7 @@ sub mtr_kill_leftovers () {
...
@@ -465,8 +465,7 @@ sub mtr_kill_leftovers () {
if
(
kill
(
0
,
@pids
)
)
# Check if some left
if
(
kill
(
0
,
@pids
)
)
# Check if some left
{
{
# FIXME maybe just mtr_warning() ?
mtr_warning
("
can't kill process(es)
"
.
join
("
",
@pids
));
mtr_error
("
can't kill process(es)
"
.
join
("
",
@pids
));
}
}
}
}
}
}
...
@@ -479,7 +478,7 @@ sub mtr_kill_leftovers () {
...
@@ -479,7 +478,7 @@ sub mtr_kill_leftovers () {
{
{
if
(
mtr_ping_mysqld_server
(
$srv
->
{'
port
'},
$srv
->
{'
sockfile
'})
)
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.pl
View file @
fb3b7682
...
@@ -312,6 +312,9 @@ our $opt_udiff;
...
@@ -312,6 +312,9 @@ our $opt_udiff;
our
$opt_skip_ndbcluster
;
our
$opt_skip_ndbcluster
;
our
$opt_with_ndbcluster
;
our
$opt_with_ndbcluster
;
our
$opt_with_ndbcluster_only
=
0
;
# dummy, ignored
our
$opt_with_openssl
;
our
$exe_ndb_mgm
;
our
$exe_ndb_mgm
;
our
$path_ndb_tools_dir
;
our
$path_ndb_tools_dir
;
...
@@ -572,6 +575,7 @@ sub command_line_setup () {
...
@@ -572,6 +575,7 @@ sub command_line_setup () {
'
force
'
=>
\
$opt_force
,
'
force
'
=>
\
$opt_force
,
'
with-ndbcluster
'
=>
\
$opt_with_ndbcluster
,
'
with-ndbcluster
'
=>
\
$opt_with_ndbcluster
,
'
skip-ndbcluster|skip-ndb
'
=>
\
$opt_skip_ndbcluster
,
'
skip-ndbcluster|skip-ndb
'
=>
\
$opt_skip_ndbcluster
,
'
with-ndbcluster-only
'
=>
\
$opt_with_ndbcluster_only
,
'
do-test=s
'
=>
\
$opt_do_test
,
'
do-test=s
'
=>
\
$opt_do_test
,
'
suite=s
'
=>
\
$opt_suite
,
'
suite=s
'
=>
\
$opt_suite
,
'
skip-rpl
'
=>
\
$opt_skip_rpl
,
'
skip-rpl
'
=>
\
$opt_skip_rpl
,
...
@@ -677,6 +681,11 @@ sub command_line_setup () {
...
@@ -677,6 +681,11 @@ sub command_line_setup () {
print
'
#
'
x
78
,
"
\n\n
";
print
'
#
'
x
78
,
"
\n\n
";
}
}
if
(
$opt_with_ndbcluster_only
)
{
print
"
# Option '--with-ndbcluster-only' is ignored in this release.
\n
";
}
foreach
my
$arg
(
@ARGV
)
foreach
my
$arg
(
@ARGV
)
{
{
if
(
$arg
=~
/^--skip-/
)
if
(
$arg
=~
/^--skip-/
)
...
...
mysql-test/mysql-test-run.sh
View file @
fb3b7682
...
@@ -277,6 +277,7 @@ EXTRA_MYSQLSHOW_OPT=""
...
@@ -277,6 +277,7 @@ EXTRA_MYSQLSHOW_OPT=""
EXTRA_MYSQLBINLOG_OPT
=
""
EXTRA_MYSQLBINLOG_OPT
=
""
USE_RUNNING_SERVER
=
0
USE_RUNNING_SERVER
=
0
USE_NDBCLUSTER
=
@USE_NDBCLUSTER@
USE_NDBCLUSTER
=
@USE_NDBCLUSTER@
USE_NDBCLUSTER_ONLY
=
0
USE_RUNNING_NDBCLUSTER
=
""
USE_RUNNING_NDBCLUSTER
=
""
USE_PURIFY
=
""
USE_PURIFY
=
""
PURIFY_LOGS
=
""
PURIFY_LOGS
=
""
...
@@ -315,6 +316,8 @@ STRESS_INIT_FILE=""
...
@@ -315,6 +316,8 @@ STRESS_INIT_FILE=""
STRESS_TEST_FILE
=
""
STRESS_TEST_FILE
=
""
STRESS_TEST
=
""
STRESS_TEST
=
""
$ECHO
"Logging:
$0
$*
"
# To ensure we see all arguments in the output, for the test analysis tool
while
test
$#
-gt
0
;
do
while
test
$#
-gt
0
;
do
case
"
$1
"
in
case
"
$1
"
in
--embedded-server
)
--embedded-server
)
...
@@ -341,6 +344,10 @@ while test $# -gt 0; do
...
@@ -341,6 +344,10 @@ while test $# -gt 0; do
--extern
)
USE_RUNNING_SERVER
=
1
;;
--extern
)
USE_RUNNING_SERVER
=
1
;;
--with-ndbcluster
)
--with-ndbcluster
)
USE_NDBCLUSTER
=
"--ndbcluster"
;;
USE_NDBCLUSTER
=
"--ndbcluster"
;;
--with-ndbcluster-only
)
USE_NDBCLUSTER
=
"--ndbcluster"
USE_NDBCLUSTER_SLAVE
=
"--ndbcluster"
USE_NDBCLUSTER_ONLY
=
1
;;
--ndb-connectstring
=
*
)
--ndb-connectstring
=
*
)
USE_NDBCLUSTER
=
"--ndbcluster"
;
USE_NDBCLUSTER
=
"--ndbcluster"
;
USE_RUNNING_NDBCLUSTER
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--ndb-connectstring=;;"
`
;;
USE_RUNNING_NDBCLUSTER
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--ndb-connectstring=;;"
`
;;
...
@@ -1654,6 +1661,11 @@ run_testcase ()
...
@@ -1654,6 +1661,11 @@ run_testcase ()
result_file
=
"r/
$tname
.result"
result_file
=
"r/
$tname
.result"
echo
$tname
>
$CURRENT_TEST
echo
$tname
>
$CURRENT_TEST
SKIP_SLAVE
=
`
$EXPR
\(
$tname
: rpl
\)
=
0
\&
\(
$tname
: federated
\)
=
0
`
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
if
[
"
$USE_MANAGER
"
=
1
]
;
then
many_slaves
=
`
$EXPR
\(
\(
$tname
: rpl_failsafe
\)
!=
0
\)
\|
\(
\(
$tname
: rpl_chain_temp_table
\)
!=
0
\)
`
many_slaves
=
`
$EXPR
\(
\(
$tname
: rpl_failsafe
\)
!=
0
\)
\|
\(
\(
$tname
: rpl_chain_temp_table
\)
!=
0
\)
`
fi
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