summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-09-28 17:55:28 +0200
committerSergei Golubchik <serg@mariadb.org>2016-09-28 17:55:28 +0200
commit66d9696596edbc20ad36bf3d5bffb5595e8235c3 (patch)
treebbef37c9a90b63d25bee59386cac04298a13846f /mysql-test/lib/My
parent66a58f46e937cdc3d7e0529b52ad8b658d9b2cd4 (diff)
parent23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff)
downloadmariadb-git-66d9696596edbc20ad36bf3d5bffb5595e8235c3.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/lib/My')
-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;
}