[Devil-linux-commit] build/scripts/scripts mysqld,1.5.2.1,1.5.2.2

[Bruce S. <bl...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3585/scripts/scripts

Modified Files:
      Tag: rel-1-2-patches
	mysqld 
Log Message:
MySQL starts out of the box


Index: mysqld
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/mysqld,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- mysqld	25 Jul 2005 17:15:50 -0000	1.5.2.1
+++ mysqld	25 Jul 2005 18:58:06 -0000	1.5.2.2
@@ -24,7 +24,8 @@
 CONFIGNAME=MYSQL
 DAEMON=/usr/bin/mysqld_safe
 PIDFILE=/var/run/mysql.pid
-PARAMETER="-u mysql --pid-file=$PIDFILE"
+DATADIR="/var/mysql"
+PARAMETER="-u mysql --pid-file=$PIDFILE --datadir=$DATADIR"
 
 # source function library
 source /etc/init.d/functions
@@ -47,6 +48,11 @@
 
 case "$1" in
 	start)
+		if [ ! -d $DATADIR ]; then
+			echo "Initializing new $NAME data dir: "
+			mkdir $DATADIR
+			mysql_install_db --user=mysql --datadir=$DATADIR
+		fi
 		echo "Starting $NAME: "
 		$DAEMON $PARAMETER &> /dev/null &
 		;;