From 5827948456201df72a1bd73e87977c569129fb27 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 31 Oct 2012 01:35:35 -0700 Subject: Wed Oct 31 01:34:59 PDT 2012 --- community/percona-server/PKGBUILD | 43 ++++++++-------- community/percona-server/my.cnf | 10 ++-- community/percona-server/mysqld-post.sh | 6 +++ community/percona-server/mysqld-tmpfile.conf | 1 + community/percona-server/mysqld.rc | 77 ++++++++++++++++++++++++++++ community/percona-server/percona.install | 6 ++- 6 files changed, 113 insertions(+), 30 deletions(-) create mode 100644 community/percona-server/mysqld-post.sh create mode 100644 community/percona-server/mysqld-tmpfile.conf create mode 100644 community/percona-server/mysqld.rc (limited to 'community/percona-server') diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index c7888189e..dc75eefe0 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 79052 2012-10-29 17:52:46Z mtorromeo $ +# $Id: PKGBUILD 79088 2012-10-30 10:54:31Z mtorromeo $ # Maintainer: Massimiliano Torromeo pkgname=percona-server pkgver=5.5.28_rel29.1 -pkgrel=1 -pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" +pkgrel=2 +pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') -depends=('mysql-clients' 'libaio') +depends=('mysql-clients' 'systemd-tools' 'libaio') conflicts=('mysql') provides=('mysql') optdepends=('perl-dbi' 'perl-dbd-mysql') @@ -19,11 +19,11 @@ options=('!libtool' 'emptydirs') backup=('etc/mysql/my.cnf') install=percona.install source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" - 'mysqld' + 'mysqld.rc' 'my.cnf' - 'mysqld-post' + 'mysqld-post.sh' 'mysqld.service' - 'tmpfiles.conf') + 'mysqld-tmpfile.conf') build() { cd "${srcdir}/Percona-Server-${pkgver/_/-}" @@ -34,22 +34,18 @@ build() { mkdir build cd build - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fpermissive" \ - cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ -DDEFAULT_CHARSET=utf8 \ -DDEFAULT_COLLATION=utf8_general_ci \ -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_DOCREADMEDIR=share/mysql \ @@ -57,7 +53,7 @@ build() { -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/mysql/docs \ -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=OFF \ + -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ -DWITH_LIBWRAP=OFF \ @@ -72,7 +68,9 @@ build() { -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ -DWITH_FEDERATED_STORAGE_ENGINE=OFF \ - -DWITH_EXAMPLE_STORAGE_ENGINE=OFF + -DWITH_EXAMPLE_STORAGE_ENGINE=OFF \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fpermissive" make } @@ -81,8 +79,11 @@ package() { cd "${srcdir}"/build make DESTDIR=${pkgdir} install - install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf - install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf + install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post + install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf + install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/mysqld.service # provided by libmysqlclient rm ${pkgdir}/usr/bin/mysql_config @@ -99,15 +100,11 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 install -dm700 "${pkgdir}"/var/lib/mysql - - install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/mysqld.conf" - install -Dm644 "$srcdir/mysqld.service" "$pkgdir/usr/lib/systemd/system/mysqld.service" - install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post" } sha256sums=('2cacf3bd0f059c7ae3cb391bf2e4a2bdcbf490ed3465bfd4db9a02f0944f2d51' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' - '400e9a6e6517bbfe0971b65456dfacfb363cb54a644e4c2bacd373171611d5aa' + 'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' 'ca10dec3cc162baede651980e675fd8094e55cb2403edffaa3d0865a6184553f' - 'f05a8d81dc3d4f2cabf96747b90d8392e0584db9e10b5b3211c21478d2d0d8c3') + 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') diff --git a/community/percona-server/my.cnf b/community/percona-server/my.cnf index 9a41b4fc3..afdd6dc2c 100644 --- a/community/percona-server/my.cnf +++ b/community/percona-server/my.cnf @@ -17,15 +17,15 @@ # The following options will be passed to all MySQL clients [client] #password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock +port = 3306 +socket = /run/mysqld/mysqld.sock # Here follows entries for some specific programs # The MySQL server [mysqld] -port = 3306 -socket = /var/run/mysqld/mysqld.sock +port = 3306 +socket = /run/mysqld/mysqld.sock datadir = /var/lib/mysql skip-external-locking key_buffer_size = 16M @@ -42,7 +42,7 @@ myisam_sort_buffer_size = 8M # All interaction with mysqld must be made via Unix sockets or named pipes. # Note that using this option without enabling named pipes on Windows # (via the "enable-named-pipe" option) will render mysqld useless! -# +# skip-networking # Replication Master Server (default) diff --git a/community/percona-server/mysqld-post.sh b/community/percona-server/mysqld-post.sh new file mode 100644 index 000000000..8c404f4c4 --- /dev/null +++ b/community/percona-server/mysqld-post.sh @@ -0,0 +1,6 @@ +#!/bin/sh +while true; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 +done diff --git a/community/percona-server/mysqld-tmpfile.conf b/community/percona-server/mysqld-tmpfile.conf new file mode 100644 index 000000000..91638983f --- /dev/null +++ b/community/percona-server/mysqld-tmpfile.conf @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - \ No newline at end of file diff --git a/community/percona-server/mysqld.rc b/community/percona-server/mysqld.rc new file mode 100644 index 000000000..07f6b7e4c --- /dev/null +++ b/community/percona-server/mysqld.rc @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting Percona Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Percona Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/percona-server/percona.install b/community/percona-server/percona.install index 20b6f2932..55f7cacee 100644 --- a/community/percona-server/percona.install +++ b/community/percona-server/percona.install @@ -1,8 +1,10 @@ post_install(){ groupadd -g 89 mysql &>/dev/null useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql - chown -R mysql:mysql /var/lib/mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql + chown -R mysql:mysql var/lib/mysql &>/dev/null + + usr/bin/systemd-tmpfiles --create mysqld.conf } post_upgrade(){ -- cgit v1.2.3-54-g00ecf