commit 0bbce585ca8b0171598a330fa5be5b75491a652e Author: Juergen Daubert <jue@jue.li> Date: Mon Jun 29 15:35:17 2015 +0200 [notify] mysql: minor structural changes - location of pid-file changed from /var/run to directory /var/run/mysql which is owned by mysql:mysql - added new directoy /var/log/mysql owned by mysql:mysql which can be used to log queries - logging of queries is now longer enabled in /etc/my.cnf - error messages are logged to /var/log/mysqld.log Note: rejmerge /etc/my.conf to avoid problems due to the above changes diff --git a/mysql/.footprint b/mysql/.footprint index 14b1840..be38058 100644 --- a/mysql/.footprint +++ b/mysql/.footprint @@ -254,4 +254,6 @@ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwx------ mysql/mysql var/lib/mysql/ drwxr-xr-x root/root var/log/ --rw------- mysql/mysql var/log/mysqld.log (EMPTY) +drwx------ mysql/mysql var/log/mysql/ +drwxr-xr-x root/root var/run/ +drwx------ mysql/mysql var/run/mysql/ diff --git a/mysql/.md5sum b/mysql/.md5sum index e37688b..c8ce7b7 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,3 +1,3 @@ -0bf963dec6788c90f82ab7b104b8f427 my.cnf +1622e62c80d128f1951a12c0125d3fb5 my.cnf 37664399c91021abe070faa700ecd0ed mysql-5.6.25.tar.gz -464c23eafb83d93f24d2a04415db2202 mysqld +5ce1297ee84c95df59260707f0ec44c3 mysqld diff --git a/mysql/Pkgfile b/mysql/Pkgfile index 2d1dd03..2ef4f0e 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -5,7 +5,7 @@ name=mysql version=5.6.25 -release=1 +release=2 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.... \ my.cnf mysqld) @@ -34,10 +34,7 @@ build () { rm $PKG/usr/share/mysql/charsets/README find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \; - install -d $PKG/var/{lib,log} - touch mysqld.log - install -m 600 -o mysql -g mysql mysqld.log $PKG/var/log - install -d -m 700 -o mysql -g mysql $PKG/var/lib/mysql + install -d -m 700 -o mysql -g mysql $PKG/var/{lib,log,run}/mysql install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld install -m 600 $SRC/my.cnf $PKG/etc } diff --git a/mysql/my.cnf b/mysql/my.cnf index db6f0d3..e8854b5 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -5,11 +5,11 @@ [mysqld] datadir = /var/lib/mysql user = mysql -pid-file = /var/run/mysqld.pid +pid-file = /var/run/mysql/mysqld.pid socket = /tmp/mysql.sock port = 3306 -general_log = 1 -general_log_file = /var/log/mysqld.log +#general_log = 1 +#general_log_file = /var/log/mysql/general.log skip-networking skip-innodb diff --git a/mysql/mysqld b/mysql/mysqld index eb9b74e..8df06b2 100644 --- a/mysql/mysqld +++ b/mysql/mysqld @@ -6,13 +6,12 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/mysqld MYSQL_CFG=/etc/my.cnf -PID=$(sed -n 's/^pid-file[ \t]*=[ \t]*//p' $MYSQL_CFG) -USR=$(sed -n 's/^user[ \t]*=[ \t]*//p' $MYSQL_CFG) +PID=/var/run/mysql/mysqld.pid +LOG=/var/log/mysqld.log case $1 in start) - touch $PID && chown $USR:$USR $PID - $SSD --start --background --pidfile $PID --exec $PROG + $SSD --start -bC --pidfile $PID --exec $PROG >> $LOG 2>&1 ;; stop) $SSD --stop --remove-pidfile --retry 10 --pidfile $PID