Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=6ffd6e5b04baa6ded10257545dee4c43bd1ca574
commit 6ffd6e5b04baa6ded10257545dee4c43bd1ca574 Author: James Buren <[email protected]> Date: Mon Jul 23 14:52:45 2012 -0500 mysql-5.5.25-6-x86_64 * make it possible to disable binary logging via sysconfig file diff --git a/source/apps-extra/mysql/FrugalBuild b/source/apps-extra/mysql/FrugalBuild index 0040c84..0dfdc44a2 100644 --- a/source/apps-extra/mysql/FrugalBuild +++ b/source/apps-extra/mysql/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mysql pkgver=5.5.25 -pkgrel=5 +pkgrel=6 extrapkgver=a pkgdesc="A fast SQL database server" url="http://www.mysql.com/"; @@ -19,8 +19,8 @@ up2date="lynx -dump http://dev.mysql.com/downloads/rss.php|grep -i mysql.*server mirror="http://cdn.mysql.com"; source=($mirror/Downloads/MySQL-5.5/$pkgname-$pkgver$extrapkgver.tar.gz \ rc.mysqld my.cnf mysqld.service mysql_wait mysql_setup mysql_run \ - fix-non-portable-code-client-plugin.patch) -signatures=($source.asc '' '' '' '' '' '' '') + fix-non-portable-code-client-plugin.patch mysqld) +signatures=($source.asc '' '' '' '' '' '' '' '') subpkgs=('libmysqlclient' 'libmysqld') subdescs=('MySQL client library.' 'Embedded MySQL Server Library') @@ -76,11 +76,12 @@ EOF Fsplit libmysqld usr/lib/libmysqld.a Fsplit libmysqld usr/bin/*_embedded + Ffile /etc/sysconfig/mysqld Fexe /usr/bin/mysql_wait Fexe /usr/bin/mysql_setup Fexe /usr/bin/mysql_run Ffile /lib/systemd/system/mysqld.service Fgenscriptlet -} +} # optimization ok diff --git a/source/apps-extra/mysql/mysql_run b/source/apps-extra/mysql/mysql_run index 430663b2..0bea4aa 100644 --- a/source/apps-extra/mysql/mysql_run +++ b/source/apps-extra/mysql/mysql_run @@ -1,3 +1,5 @@ #!/bin/sh -exec mysqld_safe --basedir=/usr --log-bin=/var/lib/mysql/$(hostname)-bin +source /etc/sysconfig/mysqld + +exec mysqld_safe --basedir=/usr $MYSQL_OPTS diff --git a/source/apps-extra/mysql/mysql_setup b/source/apps-extra/mysql/mysql_setup index 2f0feab..d4d07a0 100644 --- a/source/apps-extra/mysql/mysql_setup +++ b/source/apps-extra/mysql/mysql_setup @@ -1,7 +1,9 @@ #!/bin/sh +source /etc/sysconfig/mysqld + FILES="$(ls -l /var/lib/mysql/*)" if [ -z "$FILES" ]; then - mysql_install_db --basedir=/usr --log-bin=/var/lib/mysql/$(hostname)-bin + mysql_install_db --basedir=/usr $MYSQL_OPTS fi diff --git a/source/apps-extra/mysql/mysqld b/source/apps-extra/mysql/mysqld new file mode 100644 index 0000000..89d9707 --- /dev/null +++ b/source/apps-extra/mysql/mysqld @@ -0,0 +1 @@ +MYSQL_OPTS="--log-bin=/var/lib/mysql/$(hostname)-bin" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
