summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-09-27 09:21:19 +0200
committerSergei Golubchik <serg@mariadb.org>2016-09-27 09:21:19 +0200
commit77ce4ead811b606540b9a2cf6d9ce3146a91ab0f (patch)
tree5dcd215abf7afd125ad5744697565121b954c1b2 /mysql-test/lib
parent677c44f0c37973ad70550d9b807781e688764fae (diff)
parentd61e5260fb9983ea8dff539b23a6d0a150c2065c (diff)
downloadmariadb-git-77ce4ead811b606540b9a2cf6d9ce3146a91ab0f.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/My/CoreDump.pm6
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm
index 0e90967ef95..f9f7b3d8d4b 100644
--- a/mysql-test/lib/My/CoreDump.pm
+++ b/mysql-test/lib/My/CoreDump.pm
@@ -261,11 +261,7 @@ sub show {
# On Windows, rely on cdb to be there...
if (IS_WINDOWS)
{
- # Starting cdb is unsafe when used with --parallel > 1 option
- if ( $parallel < 2 )
- {
- _cdb($core_name);
- }
+ _cdb($core_name);
return;
}