diff options
| author | unknown <anozdrin@mysql.com> | 2006-05-22 14:22:58 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-05-22 14:22:58 +0400 |
| commit | e4b94fa0969b7fb3380389dadb2e1d207720f2f3 (patch) | |
| tree | d756402e41acccf5656b880df10ab31c4e9a8ca5 /support-files | |
| parent | 39e2c39cd49afc8bc8555aebb992da317f12b86e (diff) | |
| parent | fa9f7116e86ba2976efe612bf51306d5263cf72f (diff) | |
| download | mariadb-git-e4b94fa0969b7fb3380389dadb2e1d207720f2f3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
server-tools/instance-manager/instance_options.cc:
Manually merged.
server-tools/instance-manager/instance_options.h:
Manually merged.
server-tools/instance-manager/manager.cc:
Manually merged.
server-tools/instance-manager/manager.h:
Manually merged.
server-tools/instance-manager/options.cc:
Manually merged.
server-tools/instance-manager/options.h:
Manually merged.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index bf17375c0eb..bd16297f8e7 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -265,7 +265,10 @@ case "$mode" in then # Give extra arguments to mysqld with the my.cnf file. This script may # be overwritten at next upgrade. - $manager --user=$user --pid-file=$pid_file >/dev/null 2>&1 & + "$manager" \ + --mysqld-safe-compatible \ + --user="$user" \ + --pid-file="$pid_file" >/dev/null 2>&1 & wait_for_pid created # Make lock for RedHat / SuSE |