summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/instance_options.cc
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-02-05 10:15:34 +0300
committerunknown <petr@mysql.com>2005-02-05 10:15:34 +0300
commit87e104e44172ff4ed671d9d7c490d61e010c5fb3 (patch)
tree41d2130d2f0d28fd7e56e247791396f68c4dd357 /server-tools/instance-manager/instance_options.cc
parentab432d6c05d957eeaf7b311a16f2928614241f03 (diff)
downloadmariadb-git-87e104e44172ff4ed671d9d7c490d61e010c5fb3.tar.gz
Fixed setup scripts to use mysqlmanager instead of mysqld_safe
server-tools/instance-manager/Makefile.am: obsolete defaults removed. Also changed default binary placement. Now mysqlmanager should be installed in libexecdir (usually /usr/sbin) server-tools/instance-manager/instance_options.cc: bug, resulted in skipping non-sepcially recognized mysqld options fixed server-tools/instance-manager/user_map.cc: log message made a bit more verbose support-files/mysql.server.sh: use mysqlmanager tp start mysqld support-files/mysql.spec.sh: mysqlmanager should be placed in /usr/bin
Diffstat (limited to 'server-tools/instance-manager/instance_options.cc')
-rw-r--r--server-tools/instance-manager/instance_options.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc
index 31a1eafdd00..e7e17691330 100644
--- a/server-tools/instance-manager/instance_options.cc
+++ b/server-tools/instance-manager/instance_options.cc
@@ -225,6 +225,9 @@ int Instance_options::add_option(const char* option)
}
}
+ /* if we haven't returned earlier we should just save the option */
+ insert_dynamic(&options_array,(gptr) &tmp);
+
return 0;
err: