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
53 lines
1.7 KiB
Plaintext
53 lines
1.7 KiB
Plaintext
--- mysql-3.23.23.orig/scripts/mysql_install_db.sh
|
|
+++ mysql-3.23.23/scripts/mysql_install_db.sh
|
|
@@ -11,6 +11,7 @@
|
|
ldata=@localstatedir@
|
|
execdir=@libexecdir@
|
|
bindir=@bindir@
|
|
+sbindir=@sbindir@
|
|
force=0
|
|
IN_RPM=0
|
|
defaults=
|
|
@@ -47,6 +48,10 @@
|
|
then
|
|
bindir=`grep "^bindir" $conf | sed 's;^[^=]*=[ \t]*;;' | sed 's;[ \t]$;;'`
|
|
fi
|
|
+ if grep "^sbindir" $conf >/dev/null
|
|
+ then
|
|
+ sbindir=`grep "^sbindir" $conf | sed '.*=[ \t]*//`
|
|
+ fi
|
|
if grep "^user" $conf >/dev/null
|
|
then
|
|
user=`grep "^user" $conf | sed 's;^[^=]*=[ \t]*;;' | sed 's;[ \t]$;;'`
|
|
@@ -56,7 +61,7 @@
|
|
for arg
|
|
do
|
|
case "$arg" in
|
|
- --basedir=*) basedir=`echo "$arg"|sed 's;^--basedir=;;'`; bindir="$basedir/bin"; execdir="$basedir/libexec" ;;
|
|
+ --basedir=*) basedir=`echo "$arg"|sed 's;^--basedir=;;'`; bindir="$basedir/bin"; sbindir="$basedir/sbin"; execdir="$basedir/libexec" ;;
|
|
--datadir=*) ldata=`echo "$arg"|sed 's;^--datadir=;;'` ;;
|
|
--user=*) user=`echo "$arg"|sed 's;^--user=;;'` ;;
|
|
esac
|
|
@@ -82,10 +87,10 @@
|
|
# Check if hostname is valid
|
|
if test "$IN_RPM" -eq 0 -a $force -eq 0
|
|
then
|
|
- resolved=`$bindir/resolveip $hostname 2>&1`
|
|
+ resolved=`$bindir/mysql_resolveip $hostname 2>&1`
|
|
if [ $? -ne 0 ]
|
|
then
|
|
- resolved=`$bindir/resolveip localhost 2>&1`
|
|
+ resolved=`$bindir/mysql_resolveip localhost 2>&1`
|
|
if [ $? -eq 0 ]
|
|
then
|
|
echo "Sorry, the host '$hostname' could not be looked up."
|
|
@@ -300,7 +305,7 @@
|
|
if test -z "$IN_RPM"
|
|
then
|
|
echo "You can start the MySQL demon with:"
|
|
- echo "cd @prefix@ ; $bindir/safe_mysqld &"
|
|
+ echo "cd @prefix@ ; $sbindir/safe_mysqld &"
|
|
echo
|
|
echo "You can test the MySQL demon with the benchmarks in the 'sql-bench' directory:"
|
|
echo "cd sql-bench ; run-all-tests"
|