summaryrefslogtreecommitdiff
path: root/recipes/mysql
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-11-04 16:33:43 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-11-04 16:33:43 +0100
commitbfb8287d876eb66fd1254b1c86309e9092c978a3 (patch)
tree034f1cad84ac4c9c382d077c0a1f549d8e8c2215 /recipes/mysql
parentd5270e5061a5b96c2ba1470c607308a414085359 (diff)
mysql: changed postinstall: pid file goes to /var/run/mysql i.s.o /var/run as mysqld cannot write to /var/run
this alo changes /etc/my.cnf
Diffstat (limited to 'recipes/mysql')
-rw-r--r--recipes/mysql/files/my.cnf2
-rw-r--r--recipes/mysql/mysql_4.1.22.bb6
2 files changed, 5 insertions, 3 deletions
diff --git a/recipes/mysql/files/my.cnf b/recipes/mysql/files/my.cnf
index 15a8b1b4ab..46f5316bc5 100644
--- a/recipes/mysql/files/my.cnf
+++ b/recipes/mysql/files/my.cnf
@@ -10,7 +10,7 @@ err-log = /var/log/mysql.err
user = mysql
port = 3306
socket = /tmp/mysql.sock
-pid-file = /var/run/mysqld.pid
+pid-file = /var/run/mysql/mysqld.pid
log-error = /var/log/mysqld.err
basedir = /usr
datadir = /var/mysql
diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
index b6718cb0cb..dae1dd6701 100644
--- a/recipes/mysql/mysql_4.1.22.bb
+++ b/recipes/mysql/mysql_4.1.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/"
SECTION = "libs"
LICENSE = "GPL"
DEPENDS = "ncurses"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
file://autofoo.patch;patch=1 \
@@ -63,7 +63,8 @@ pkg_postinst_mysql-server () {
#Install the database
test -d /usr/bin || mkdir -p /usr/bin
test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname
- chmod go+rw /var/run
+ mkdir /var/run/mysql
+ chown mysql.nogroup /var/run/mysql
mysql_install_db
@@ -74,6 +75,7 @@ pkg_postrm_mysql-server () {
}
PACKAGES = "${PN}-dbg ${PN} libmysqlclient libmysqlclient-dev mysql-client mysql-server ${PN}-leftovers"
+CONFFILES_mysql-server = "${sysconfdir}/my.cnf"
FILES_${PN} = " "
RDEPENDS_${PN} = "mysql-client mysql-server"