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
af0e2572
Commit
af0e2572
authored
Mar 28, 2013
by
sayantan dutta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #16403186 - MTR ON WINDOWS SHOULD NOT TRY TO START CDB IF RUNNING WITH PARALLEL
parent
298bfa40
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
mysql-test/lib/My/CoreDump.pm
mysql-test/lib/My/CoreDump.pm
+7
-3
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+2
-2
No files found.
mysql-test/lib/My/CoreDump.pm
View file @
af0e2572
# -*- cperl -*-
# Copyright (c) 2008, 201
1
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2008, 201
3
, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
...
...
@@ -255,13 +255,17 @@ EOF
sub show {
my ($class, $core_name, $exe_mysqld)= @_;
my ($class, $core_name, $exe_mysqld
, $parallel
)= @_;
$hint_mysqld= $exe_mysqld;
# On Windows, rely on cdb to be there...
if (IS_WINDOWS)
{
_cdb($core_name);
# Starting cdb is unsafe when used with --parallel > 1 option
if ( $parallel < 2 )
{
_cdb($core_name);
}
return;
}
...
...
mysql-test/mysql-test-run.pl
View file @
af0e2572
#!/usr/bin/perl
# -*- cperl -*-
# Copyright (c) 2004, 201
2
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2004, 201
3
, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
...
...
@@ -641,7 +641,7 @@ sub run_test_server ($$$) {
mtr_report
("
- found '
$core_name
'
",
"
(
$num_saved_cores
/
$opt_max_save_core
)
");
My::
CoreDump
->
show
(
$core_file
,
$exe_mysqld
);
My::
CoreDump
->
show
(
$core_file
,
$exe_mysqld
,
$opt_parallel
);
if
(
$num_saved_cores
>=
$opt_max_save_core
)
{
mtr_report
("
- deleting it, already saved
",
...
...
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