- use -p flag for mkdir in mysql_install_db
- if the socket dir does not exist then create it as part of startup in safe_mysqld
This commit is contained in:
brad
parent
670c14f805
commit
d4dab887c8
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.75 2002/03/16 16:44:10 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.76 2002/03/19 19:11:39 brad Exp $
|
||||
# $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $
|
||||
# Uses pthreads
|
||||
|
||||
@ -9,7 +9,7 @@ COMMENT-tests= "multithreaded SQL database (regression test suite)"
|
||||
# More architectures need testing of MySQL+native threads
|
||||
# alpha - does not work
|
||||
# hppa, m68k, m88k, vax - untested
|
||||
# powerpc - a bug, when running (My)SQL bench the CPU utilization goes up
|
||||
# powerpc - a bug, when running (My)SQL bench the CPU utilization goes up
|
||||
# to 100% and mysqld stops responding
|
||||
# sparc64 - linker issue?
|
||||
WORKING_ARCHS= i386 sparc
|
||||
@ -78,7 +78,7 @@ SUBPACKAGE?=
|
||||
|
||||
.if ${FLAVOR:L:Mbdb}
|
||||
. if ${MACHINE_ARCH} != "i386"
|
||||
BROKEN= "The BerkeleyDB transaction support has not been tested on your architecture yet"
|
||||
BROKEN= "The BerkeleyDB transaction support has not been tested on your architecture yet"
|
||||
. else
|
||||
CONFIGURE_ARGS+= --with-berkeley-db
|
||||
. endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.7 2002/02/19 03:58:57 brad Exp $
|
||||
$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.8 2002/03/19 19:11:39 brad Exp $
|
||||
--- scripts/mysql_install_db.sh.orig Thu Feb 14 12:30:26 2002
|
||||
+++ scripts/mysql_install_db.sh Mon Feb 18 20:04:30 2002
|
||||
+++ scripts/mysql_install_db.sh Sat Mar 2 01:23:08 2002
|
||||
@@ -7,12 +7,9 @@
|
||||
#
|
||||
# All unrecognized arguments to this script are passed to mysqld.
|
||||
@ -102,9 +102,9 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.7 2002/02/19 03:58:57 brad Exp $
|
||||
- chown $user $ldata $ldata/mysql $ldata/test;
|
||||
- fi
|
||||
-fi
|
||||
+if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
|
||||
+if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700 $ldata/mysql ; fi
|
||||
+if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test ; fi
|
||||
+if test ! -d $ldata; then mkdir -p $ldata; chmod 700 $ldata ; fi
|
||||
+if test ! -d $ldata/mysql; then mkdir -p $ldata/mysql; chmod 700 $ldata/mysql ; fi
|
||||
+if test ! -d $ldata/test; then mkdir -p $ldata/test; chmod 700 $ldata/test ; fi
|
||||
+chown $user:$group $ldata $ldata/mysql $ldata/test;
|
||||
|
||||
# Initialize variables
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-scripts_safe_mysqld.sh,v 1.6 2001/09/10 02:59:35 brad Exp $
|
||||
--- scripts/safe_mysqld.sh.orig Sat Sep 8 15:08:13 2001
|
||||
+++ scripts/safe_mysqld.sh Sun Sep 9 20:12:02 2001
|
||||
@@ -68,30 +68,9 @@ parse_arguments() {
|
||||
$OpenBSD: patch-scripts_safe_mysqld.sh,v 1.7 2002/03/19 19:11:39 brad Exp $
|
||||
--- scripts/safe_mysqld.sh.orig Thu Feb 14 12:30:15 2002
|
||||
+++ scripts/safe_mysqld.sh Tue Mar 19 13:01:45 2002
|
||||
@@ -68,34 +68,16 @@ parse_arguments() {
|
||||
done
|
||||
}
|
||||
|
||||
@ -35,7 +35,15 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.6 2001/09/10 02:59:35 brad Exp $
|
||||
|
||||
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
|
||||
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
|
||||
@@ -221,10 +200,10 @@ fi
|
||||
-user=@MYSQLD_USER@
|
||||
+user=mysql
|
||||
+group=mysql
|
||||
+
|
||||
+socket_dir=`dirname $MYSQL_UNIX_PORT`
|
||||
|
||||
# Use the mysqld-max binary by default if the user doesn't specify a binary
|
||||
if test -x $ledir/mysqld-max
|
||||
@@ -221,10 +203,17 @@ fi
|
||||
echo "Starting $MYSQLD daemon with databases from $DATADIR"
|
||||
|
||||
# Does this work on all systems?
|
||||
@ -46,11 +54,18 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.6 2001/09/10 02:59:35 brad Exp $
|
||||
+if type ulimit | grep "shell builtin" > /dev/null
|
||||
+then
|
||||
+ ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems
|
||||
+fi
|
||||
+
|
||||
+if test ! -d $socket_dir
|
||||
+then
|
||||
+ mkdir -p $socket_dir
|
||||
+ chown $user:$group $socket_dir
|
||||
+ chmod 711 $socket_dir
|
||||
+fi
|
||||
|
||||
echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log
|
||||
while true
|
||||
@@ -239,34 +218,6 @@ do
|
||||
@@ -239,34 +228,6 @@ do
|
||||
if test ! -f $pid_file # This is removed if normal shutdown
|
||||
then
|
||||
break
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: INSTALL-server,v 1.6 2002/02/26 03:42:06 brad Exp $
|
||||
# $OpenBSD: INSTALL-server,v 1.7 2002/03/19 19:11:39 brad Exp $
|
||||
#
|
||||
# Pre/post-installation setup of MySQL
|
||||
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/usr/local}
|
||||
DB_DIR=${DB_DIR}
|
||||
SOCKET_DIR=${SOCKET_DIR}
|
||||
MYSQLUSER=mysql
|
||||
MYSQLGROUP=mysql
|
||||
|
||||
@ -51,11 +50,6 @@ do_database_install()
|
||||
$PREFIX/bin/mysql_install_db
|
||||
}
|
||||
|
||||
do_socket_install()
|
||||
{
|
||||
install -d -o $MYSQLUSER -g $MYSQLGROUP -m 711 $SOCKET_DIR
|
||||
}
|
||||
|
||||
# Verify/process the command
|
||||
#
|
||||
case $2 in
|
||||
@ -69,9 +63,6 @@ case $2 in
|
||||
if [ ! -d $DB_DIR ]; then
|
||||
do_database_install
|
||||
fi
|
||||
if [ ! -d $SOCKET_DIR ]; then
|
||||
do_socket_install
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user