summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2009-02-04 14:26:04 -0500
committerChad MILLER <chad@mysql.com>2009-02-04 14:26:04 -0500
commitfdd9ad2cb7aafa82e5696a565e50e770a0d8632b (patch)
tree71d7ab99cfea81fb12c21a37ce60775847c5108c /scripts
parent9736298154449cb117c6285db26685f45fc8d618 (diff)
parent69cd86934d0b861f53ea309d0bfb52870902cbe9 (diff)
downloadmariadb-git-fdd9ad2cb7aafa82e5696a565e50e770a0d8632b.tar.gz
Merge from 5.0-bugteam.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_multi.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 3cb4665eb1c..631e1e38cc7 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -293,7 +293,12 @@ sub start_mysqlds()
@groups = &find_groups($groupids);
for ($i = 0; defined($groups[$i]); $i++)
{
+ # Defaults are made explicit parameters to server execution...
@options = defaults_for_group($groups[$i]);
+ # ...so server MUST NOT try to read again from some config file, especially
+ # as the "right" file may be unknown to the server if we are using
+ # --defaults-file=... params in here.
+ unshift(@options,"--no-defaults");
$mysqld_found= 1; # The default
$mysqld_found= 0 if (!length($mysqld));