diff options
author | Chad MILLER <chad@mysql.com> | 2009-04-02 15:42:29 -0400 |
---|---|---|
committer | Chad MILLER <chad@mysql.com> | 2009-04-02 15:42:29 -0400 |
commit | 56d421e478ab720ac364be9794409621c6f70b44 (patch) | |
tree | 28589c253c164ed0193c3c5e6d496d8af3249b42 /scripts | |
parent | ff9803acea8e7270e1b58f8221fbcd902580e052 (diff) | |
parent | 02f8ec4d762a9ffdb8810387ab0ebd1416d3e87d (diff) | |
download | mariadb-git-56d421e478ab720ac364be9794409621c6f70b44.tar.gz |
Merge revert of bug32136 into 5.1.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysqld_multi.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 631e1e38cc7..3cb4665eb1c 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -293,12 +293,7 @@ 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)); |