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
21892f41
Commit
21892f41
authored
18 years ago
by
msvensson@shellback.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
f8dbb2dd
9cb40c6e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
21 deletions
+19
-21
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+0
-8
mysql-test/lib/mtr_stress.pl
mysql-test/lib/mtr_stress.pl
+0
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+19
-12
No files found.
mysql-test/lib/mtr_process.pl
View file @
21892f41
...
@@ -470,14 +470,6 @@ sub mtr_kill_leftovers () {
...
@@ -470,14 +470,6 @@ sub mtr_kill_leftovers () {
mtr_debug
("
Got pid:
$pid
from file '
$pidfile
'
");
mtr_debug
("
Got pid:
$pid
from file '
$pidfile
'
");
# Race, could have been removed between I tested with -f
# and the unlink() below, so I better check again with -f
if
(
!
unlink
(
$pidfile
)
and
-
f
$pidfile
)
{
mtr_error
("
can't remove
$pidfile
");
}
if
(
$::glob_cygwin_perl
or
kill
(
0
,
$pid
)
)
if
(
$::glob_cygwin_perl
or
kill
(
0
,
$pid
)
)
{
{
mtr_debug
("
There is process with pid
$pid
-- scheduling for kill.
");
mtr_debug
("
There is process with pid
$pid
-- scheduling for kill.
");
...
...
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_stress.pl
View file @
21892f41
...
@@ -21,7 +21,6 @@ sub run_stress_test ()
...
@@ -21,7 +21,6 @@ sub run_stress_test ()
{
{
my
$args
;
my
$args
;
my
$stress_basedir
;
my
$stress_suitedir
;
my
$stress_suitedir
;
mtr_report
("
Starting stress testing
\n
");
mtr_report
("
Starting stress testing
\n
");
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.pl
View file @
21892f41
...
@@ -850,7 +850,7 @@ sub command_line_setup () {
...
@@ -850,7 +850,7 @@ sub command_line_setup () {
if
(
!
$opt_suite_timeout
)
if
(
!
$opt_suite_timeout
)
{
{
$opt_suite_timeout
=
$default_suite_timeout
;
$opt_suite_timeout
=
$default_suite_timeout
;
$opt_suite_timeout
*=
4
if
defined
$opt_valgrind
;
$opt_suite_timeout
*=
6
if
defined
$opt_valgrind
;
}
}
# Increase times to wait for executables to start if using valgrind
# Increase times to wait for executables to start if using valgrind
...
@@ -1309,7 +1309,7 @@ sub kill_running_server () {
...
@@ -1309,7 +1309,7 @@ sub kill_running_server () {
{
{
# Ensure that no old mysqld test servers are running
# Ensure that no old mysqld test servers are running
# This is different from terminating processes we have
# This is different from terminating processes we have
# started from ths run of the script, this is terminating
# started from th
i
s run of the script, this is terminating
# leftovers from previous runs.
# leftovers from previous runs.
mtr_report
("
Killing Possible Leftover Processes
");
mtr_report
("
Killing Possible Leftover Processes
");
...
@@ -1720,14 +1720,15 @@ sub initialize_servers () {
...
@@ -1720,14 +1720,15 @@ sub initialize_servers () {
sub
mysql_install_db
()
{
sub
mysql_install_db
()
{
# FIXME not exactly true I think, needs improvements
# FIXME not exactly true I think, needs improvements
install_db
('
master
',
$master
->
[
0
]
->
{'
path_myddir
'});
install_db
('
master1
',
$master
->
[
0
]
->
{'
path_myddir
'});
install_db
('
master
',
$master
->
[
1
]
->
{'
path_myddir
'});
install_db
('
master2
',
$master
->
[
1
]
->
{'
path_myddir
'});
if
(
$use_slaves
)
if
(
$use_slaves
)
{
{
install_db
('
slave
',
$slave
->
[
0
]
->
{'
path_myddir
'});
install_db
('
slave
1
',
$slave
->
[
0
]
->
{'
path_myddir
'});
install_db
('
slave
',
$slave
->
[
1
]
->
{'
path_myddir
'});
install_db
('
slave
2
',
$slave
->
[
1
]
->
{'
path_myddir
'});
install_db
('
slave
',
$slave
->
[
2
]
->
{'
path_myddir
'});
install_db
('
slave
3
',
$slave
->
[
2
]
->
{'
path_myddir
'});
}
}
if
(
!
$opt_skip_im
)
if
(
!
$opt_skip_im
)
...
@@ -1803,6 +1804,12 @@ sub install_db ($$) {
...
@@ -1803,6 +1804,12 @@ sub install_db ($$) {
mtr_add_arg
(
$args
,
"
--skip-ndbcluster
");
mtr_add_arg
(
$args
,
"
--skip-ndbcluster
");
mtr_add_arg
(
$args
,
"
--skip-bdb
");
mtr_add_arg
(
$args
,
"
--skip-bdb
");
if
(
$opt_debug
)
{
mtr_add_arg
(
$args
,
"
--debug=d:t:i:A,%s/log/bootstrap_%s.trace
",
$opt_vardir_trace
,
$type
);
}
if
(
!
$opt_netware
)
if
(
!
$opt_netware
)
{
{
mtr_add_arg
(
$args
,
"
--language=%s
",
$path_language
);
mtr_add_arg
(
$args
,
"
--language=%s
",
$path_language
);
...
@@ -2399,7 +2406,7 @@ sub do_before_start_slave ($$) {
...
@@ -2399,7 +2406,7 @@ sub do_before_start_slave ($$) {
sub
mysqld_arguments
($$$$$$)
{
sub
mysqld_arguments
($$$$$$)
{
my
$args
=
shift
;
my
$args
=
shift
;
my
$type
=
shift
;
# master/slave
/bootstrap
my
$type
=
shift
;
# master/slave
my
$idx
=
shift
;
my
$idx
=
shift
;
my
$extra_opt
=
shift
;
my
$extra_opt
=
shift
;
my
$slave_master_info
=
shift
;
my
$slave_master_info
=
shift
;
...
@@ -2628,7 +2635,7 @@ sub mysqld_arguments ($$$$$$) {
...
@@ -2628,7 +2635,7 @@ sub mysqld_arguments ($$$$$$) {
##############################################################################
##############################################################################
sub
mysqld_start
($$$$$)
{
sub
mysqld_start
($$$$$)
{
my
$type
=
shift
;
# master/slave
/bootstrap
my
$type
=
shift
;
# master/slave
my
$idx
=
shift
;
my
$idx
=
shift
;
my
$extra_opt
=
shift
;
my
$extra_opt
=
shift
;
my
$slave_master_info
=
shift
;
my
$slave_master_info
=
shift
;
...
@@ -2649,7 +2656,7 @@ sub mysqld_start ($$$$$) {
...
@@ -2649,7 +2656,7 @@ sub mysqld_start ($$$$$) {
}
}
else
else
{
{
$exe
=
$exe_mysqld
;
mtr_error
("
Unknown 'type' passed to mysqld_start
")
;
}
}
mtr_init_args
(
\
$args
);
mtr_init_args
(
\
$args
);
...
@@ -2748,7 +2755,7 @@ sub stop_masters () {
...
@@ -2748,7 +2755,7 @@ sub stop_masters () {
my
@args
;
my
@args
;
for
(
my
$idx
;
$idx
<
2
;
$idx
++
)
for
(
my
$idx
=
0
;
$idx
<
2
;
$idx
++
)
{
{
# FIXME if we hit ^C before fully started, this test will prevent
# FIXME if we hit ^C before fully started, this test will prevent
# the mysqld process from being killed
# the mysqld process from being killed
...
@@ -2779,7 +2786,7 @@ sub stop_slaves () {
...
@@ -2779,7 +2786,7 @@ sub stop_slaves () {
my
@args
;
my
@args
;
for
(
my
$idx
;
$idx
<
3
;
$idx
++
)
for
(
my
$idx
=
0
;
$idx
<
3
;
$idx
++
)
{
{
if
(
$slave
->
[
$idx
]
->
{'
pid
'}
)
if
(
$slave
->
[
$idx
]
->
{'
pid
'}
)
{
{
...
...
This diff is collapsed.
Click to expand it.
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