1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Fix remaining 5.2 buildbot problems:

- Cherrypick MBUG#688404  (PBXT crashes in debug/x64)
- Fix unixism (rm -rf) in the test suite_timeout
- Avoid plugin tests on Windows/embedded, plugins do not and will not work here
This commit is contained in:
Vladislav Vaintroub
2011-02-21 14:23:44 +01:00
parent 38e3787af4
commit 04879e4045
4 changed files with 21 additions and 7 deletions

View File

@@ -320,9 +320,10 @@ sub main {
gcov_prepare($basedir . "/" . $opt_gcov_src_dir);
}
if (!$opt_suites) {
$opt_suites= $DEFAULT_SUITES;
# Check for any extra suites to enable based on the path name
my %extra_suites=
(
@@ -2376,7 +2377,7 @@ sub setup_vardir() {
$plugindir="$opt_vardir/plugins";
unshift (@opt_extra_mysqld_opt, "--plugin-dir=$plugindir");
mkpath($plugindir);
if (IS_WINDOWS)
if (IS_WINDOWS && !$opt_embedded_server)
{
for (<../storage/*$opt_vs_config/*.dll>,
<../plugin/*$opt_vs_config/*.dll>,