mirror of
https://github.com/MariaDB/server.git
synced 2025-11-02 02:53:04 +03:00
bee9933ab8
support-files/mysql.server-sys5.sh: Change mode to -rw-rw-r-- Docs/manual.texi: Added information about BeOS, Access 2000, AIX and user links client/mysql.cc: Fixed SOURCE to work on windows client/mysqldump.c: Strip of white space configure.in: Fix for AIX include/dbug.h: Assert handling include/my_pthread.h: Ia64 needs more thread stack than other processors include/my_sys.h: More comments myisam/mi_key.c: Fixed wrong key length checks mysql.proj: update mysys/charset.c: Cleanup mysys/mf_keycache.c: Moved SEC_LINK to file that used it mysys/my_static.h: Moved SEC_LINK to file that used it scripts/Makefile.am: Fix for debian scripts/mysql_install_db.sh: Cleanup sql/gen_lex_hash.cc: Better values sql/ha_berkeley.cc: Fix of reading of unique key sql/handler.cc: Fix memory allocation bug sql/mysqld.cc: Fix for Ia64 sql/share/charsets/latin1.conf: Fixed sortorder back to scandinavian. sql/sql_yacc.yy: FULL shouldn't be a keyword support-files/Makefile.am: Fix for debian support-files/mysql.server.sh: Cleanups
42 lines
1.3 KiB
Plaintext
42 lines
1.3 KiB
Plaintext
--- mysql-3.23.23.orig/support-files/mysql.server.sh Tue Sep 5 19:13:35 2000
|
|
+++ mysql-3.23.23/support-files/mysql.server.sh Tue Sep 5 19:19:40 2000
|
|
@@ -16,6 +16,7 @@
|
|
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
|
basedir=@prefix@
|
|
bindir=@bindir@
|
|
+sbindir=@sbindir@
|
|
datadir=@localstatedir@
|
|
pid_file=@localstatedir@/mysqld.pid
|
|
log_file=@localstatedir@/mysqld.log
|
|
@@ -64,6 +65,10 @@
|
|
then
|
|
bindir=`grep "^bindir" $conf | cut -f 2 -d= | tr -d ' '`
|
|
fi
|
|
+ if grep "^sbindir" $conf >/dev/null
|
|
+ then
|
|
+ sbindir=`grep "^sbindir" $conf | cut -f 2 -d= | tr -d ' '`
|
|
+ fi
|
|
if grep "^log[ \t]*=" $conf >/dev/null
|
|
then
|
|
log_file=`grep "log[ \t]*=" $conf | cut -f 2 -d= | tr -d ' '`
|
|
@@ -78,14 +83,15 @@
|
|
'start')
|
|
# Start daemon
|
|
|
|
- if test -x $bindir/safe_mysqld
|
|
+ if test -x $sbindir/safe_mysqld
|
|
then
|
|
# Give extra arguments to mysqld with the my.cnf file. This script may
|
|
# be overwritten at next upgrade.
|
|
- $bindir/safe_mysqld \
|
|
- --user=$mysql_daemon_user --datadir=$datadir --pid-file=$pid_file --log=$log_file &
|
|
+ $sbindir/safe_mysqld \
|
|
+ --user=$mysql_daemon_user --datadir=$datadir --pid-file=$pid_file &
|
|
+# --log=$log_file &
|
|
else
|
|
- echo "Can't execute $bindir/safe_mysqld"
|
|
+ echo "Can't execute $sbindir/safe_mysqld"
|
|
fi
|
|
;;
|
|
|