diff options
| author | sayantan dutta <sayantan.dutta@oracle.com> | 2013-03-28 11:47:43 +0530 |
|---|---|---|
| committer | sayantan dutta <sayantan.dutta@oracle.com> | 2013-03-28 11:47:43 +0530 |
| commit | af0e25725e69ad5a2671bb54db2e85dfa1dd770f (patch) | |
| tree | 9bff885f3f13302eed434cecc6fa573cfdfe9915 /mysql-test | |
| parent | 298bfa40787128494621da27aebf995962352b55 (diff) | |
| download | mariadb-git-af0e25725e69ad5a2671bb54db2e85dfa1dd770f.tar.gz | |
Bug #16403186 - MTR ON WINDOWS SHOULD NOT TRY TO START CDB IF RUNNING WITH PARALLEL
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/My/CoreDump.pm | 10 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm index 419a0e7f39f..0e90967ef95 100644 --- a/mysql-test/lib/My/CoreDump.pm +++ b/mysql-test/lib/My/CoreDump.pm @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2013, 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; } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 72c3b17464d..01c4150d083 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- cperl -*- -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2013, 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", |