Date: Thursday, September 17, 2015 @ 12:10:59 Author: mtorromeo Revision: 140394
archrelease: copy trunk to community-i686, community-x86_64 Added: percona-server/repos/community-i686/PKGBUILD (from rev 140393, percona-server/trunk/PKGBUILD) percona-server/repos/community-i686/my.cnf (from rev 140393, percona-server/trunk/my.cnf) percona-server/repos/community-i686/mysql-user.conf (from rev 140393, percona-server/trunk/mysql-user.conf) percona-server/repos/community-i686/mysql56-bufsize.patch (from rev 140393, percona-server/trunk/mysql56-bufsize.patch) percona-server/repos/community-i686/mysqld-tmpfile.conf (from rev 140393, percona-server/trunk/mysqld-tmpfile.conf) percona-server/repos/community-i686/percona.install (from rev 140393, percona-server/trunk/percona.install) percona-server/repos/community-x86_64/PKGBUILD (from rev 140393, percona-server/trunk/PKGBUILD) percona-server/repos/community-x86_64/my.cnf (from rev 140393, percona-server/trunk/my.cnf) percona-server/repos/community-x86_64/mysql-user.conf (from rev 140393, percona-server/trunk/mysql-user.conf) percona-server/repos/community-x86_64/mysql56-bufsize.patch (from rev 140393, percona-server/trunk/mysql56-bufsize.patch) percona-server/repos/community-x86_64/mysqld-tmpfile.conf (from rev 140393, percona-server/trunk/mysqld-tmpfile.conf) percona-server/repos/community-x86_64/percona.install (from rev 140393, percona-server/trunk/percona.install) Deleted: percona-server/repos/community-i686/PKGBUILD percona-server/repos/community-i686/my.cnf percona-server/repos/community-i686/mysql-user.conf percona-server/repos/community-i686/mysql56-bufsize.patch percona-server/repos/community-i686/mysqld-tmpfile.conf percona-server/repos/community-i686/percona.install percona-server/repos/community-x86_64/PKGBUILD percona-server/repos/community-x86_64/my.cnf percona-server/repos/community-x86_64/mysql-user.conf percona-server/repos/community-x86_64/mysql56-bufsize.patch percona-server/repos/community-x86_64/mysqld-tmpfile.conf percona-server/repos/community-x86_64/percona.install ----------------------------------------+ /PKGBUILD | 308 +++++++++++++++++++++++++++++++ /my.cnf | 76 +++++++ /mysql-user.conf | 2 /mysql56-bufsize.patch | 40 ++++ /mysqld-tmpfile.conf | 2 /percona.install | 50 +++++ community-i686/PKGBUILD | 151 --------------- community-i686/my.cnf | 38 --- community-i686/mysql-user.conf | 1 community-i686/mysql56-bufsize.patch | 20 -- community-i686/mysqld-tmpfile.conf | 1 community-i686/percona.install | 25 -- community-x86_64/PKGBUILD | 151 --------------- community-x86_64/my.cnf | 38 --- community-x86_64/mysql-user.conf | 1 community-x86_64/mysql56-bufsize.patch | 20 -- community-x86_64/mysqld-tmpfile.conf | 1 community-x86_64/percona.install | 25 -- 18 files changed, 478 insertions(+), 472 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-09-17 10:10:25 UTC (rev 140393) +++ community-i686/PKGBUILD 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,151 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgbase=percona-server -pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') -pkgver=5.6.25_73.1 -_pkgver=${pkgver/_/-} -_myver=${pkgver/_rel*} -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools') -license=('GPL') -url="http://www.percona.com/software/percona-server/" -source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" - 'my.cnf' - 'mysql-user.conf' - 'mysqld-tmpfile.conf' - 'mysql56-bufsize.patch') - -prepare() { - cd $pkgbase-$_pkgver - patch -p0 -i ../mysql56-bufsize.patch - rm -v sql/sql_yacc.{cc,h} - sed 's|$datadir/mysql.sock|/run/mysqld/mysqld.sock|' \ - -i packaging/rpm-fedora/mysql-systemd-start -} - -build() { - rm -rf build - mkdir build - cd build - - cmake ../$pkgbase-$_pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -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=lib/mysql/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/perconaserver \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_PAM=ON \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNODB_MEMCACHED=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=ON \ - -DWITH_PARTITION_STORAGE_ENGINE=ON \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ - -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ - -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ - -DWITH_FEDERATED_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" \ - -DWITH_MYSQLD_LDFLAGS="$LDFLAGS" - - make -} - -package_libperconaserverclient() { - pkgdesc='Percona Server client libraries' - depends=('openssl') - - cd build - for dir in include libmysql libmysqld libservices; do - make -C $dir DESTDIR="$pkgdir" install - done - - rm "$pkgdir"/usr/lib/libmysqlservices.a - - install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config - install -d "$pkgdir"/usr/share/man/man1 - install -m644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 -} - -package_percona-server-clients() { - pkgdesc='Percona Server client tools' - depends=('libperconaserverclient' 'zlib') - conflicts=('mysql-clients') - provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") - - cd build - make -C client DESTDIR="$pkgdir" install - - # install man pages - install -d "$pkgdir"/usr/share/man/man1 - for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 - done - - # provided by percona-server - rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest,mysql_config_editor} -} - -package_percona-server() { - pkgdesc='A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation' - backup=('etc/mysql/my.cnf') - install=percona.install - depends=('percona-server-clients' 'libaio' 'systemd-tools' 'pam') - optdepends=('perl-dbd-mysql') - conflicts=('mysql') - provides=("mysql=$_myver" "mariadb=$_myver") - options=('emptydirs') - - cd build - make DESTDIR="$pkgdir" install - - install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf - install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf - install -Dm644 ../mysqld-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysqld.conf - - cd ../$pkgbase-$_pkgver/packaging/rpm-fedora - install -Dm755 mysql-systemd-start "$pkgdir"/usr/bin/mysql-systemd-start - install -Dm644 mysqld.service "$pkgdir"/usr/lib/systemd/system/mysqld.service - - # provided by libperconaserverclient - cd "$pkgdir" - rm usr/bin/mysql_config - rm usr/lib/lib{mysql,perconaserver}* - rm -r usr/include/ - rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - - # provided by percona-server-clients - rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 - - # not needed - rm -r usr/{data,mysql-test,sql-bench} - rm usr/share/man/man1/mysql-test-run.pl.1 -} - -sha256sums=('5a0d88465e4bb081e621b06bc943fafadb4c67a2cca50839b44fcd94ae793b50' - 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' - 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' - 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' - '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729') Copied: percona-server/repos/community-i686/PKGBUILD (from rev 140393, percona-server/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,154 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgbase=percona-server +pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') +pkgver=5.6.26_74.0 +_pkgver=${pkgver/_/-} +_myver=${pkgver/_rel*} +pkgrel=1 +arch=('i686' 'x86_64') +# valgrind necessary for bug https://bugs.launchpad.net/percona-server/+bug/1494283 +makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools' 'valgrind') +license=('GPL') +url="http://www.percona.com/software/percona-server/" +source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" + 'my.cnf' + 'mysql-user.conf' + 'mysqld-tmpfile.conf' + 'mysql56-bufsize.patch') + +prepare() { + cd $pkgbase-$_pkgver + patch -p0 -i ../mysql56-bufsize.patch + rm -v sql/sql_yacc.{cc,h} + sed 's|$datadir/mysql.sock|/run/mysqld/mysqld.sock|' \ + -i packaging/rpm-fedora/mysql-systemd-start + sed 's|${fullhostname}|"archbuild"|' \ + -i storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake +} + +build() { + rm -rf build + mkdir build + cd build + + cmake ../$pkgbase-$_pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_CONFIG=mysql_release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -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=lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/perconaserver \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_DOCDIR=share/mysql/docs \ + -DINSTALL_SHAREDIR=share/mysql \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_UNIT_TESTS=OFF \ + -DWITH_PAM=ON \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNODB_MEMCACHED=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=ON \ + -DWITH_PARTITION_STORAGE_ENGINE=ON \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ + -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ + -DWITH_FEDERATED_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" \ + -DWITH_MYSQLD_LDFLAGS="$LDFLAGS" + + make +} + +package_libperconaserverclient() { + pkgdesc='Percona Server client libraries' + depends=('openssl') + + cd build + for dir in include libmysql libmysqld libservices; do + make -C $dir DESTDIR="$pkgdir" install + done + + rm "$pkgdir"/usr/lib/libmysqlservices.a + + install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config + install -d "$pkgdir"/usr/share/man/man1 + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 +} + +package_percona-server-clients() { + pkgdesc='Percona Server client tools' + depends=('libperconaserverclient' 'zlib') + conflicts=('mysql-clients') + provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") + + cd build + make -C client DESTDIR="$pkgdir" install + + # install man pages + install -d "$pkgdir"/usr/share/man/man1 + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + done + + # provided by percona-server + rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest,mysql_config_editor} +} + +package_percona-server() { + pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and TokuDB storage engine' + backup=('etc/mysql/my.cnf') + install=percona.install + depends=('percona-server-clients' 'libaio' 'systemd-tools' 'pam') + optdepends=('perl-dbd-mysql') + conflicts=('mysql') + provides=("mysql=$_myver" "mariadb=$_myver") + options=('emptydirs') + + cd build + make DESTDIR="$pkgdir" install + + install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf + install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf + install -Dm644 ../mysqld-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysqld.conf + + cd ../$pkgbase-$_pkgver/packaging/rpm-fedora + install -Dm755 mysql-systemd-start "$pkgdir"/usr/bin/mysql-systemd-start + install -Dm644 mysqld.service "$pkgdir"/usr/lib/systemd/system/mysqld.service + + # provided by libperconaserverclient + cd "$pkgdir" + rm usr/bin/mysql_config + rm usr/lib/lib{mysql,perconaserver}* + rm -r usr/include/ + rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + + # provided by percona-server-clients + rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # not needed + rm -r usr/{data,mysql-test,sql-bench} + rm usr/share/man/man1/mysql-test-run.pl.1 +} + +sha256sums=('9156038d84bd1190a5b5df963877876584d30bd515ba3ad39e65a532430c1608' + 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' + 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' + 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' + '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729') Deleted: community-i686/my.cnf =================================================================== --- community-i686/my.cnf 2015-09-17 10:10:25 UTC (rev 140393) +++ community-i686/my.cnf 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,38 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html - -[client] -#password = your_password -port = 3306 -socket = /run/mysqld/mysqld.sock - -[mysqld] -port = 3306 -socket = /run/mysqld/mysqld.sock -datadir = /var/lib/mysql - -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -[mysqld_safe] -log-error = /var/log/mysqld.log -pid-file = /run/mysqld/mysqld.pid Copied: percona-server/repos/community-i686/my.cnf (from rev 140393, percona-server/trunk/my.cnf) =================================================================== --- community-i686/my.cnf (rev 0) +++ community-i686/my.cnf 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,38 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html + +[client] +#password = your_password +port = 3306 +socket = /run/mysqld/mysqld.sock + +[mysqld] +port = 3306 +socket = /run/mysqld/mysqld.sock +datadir = /var/lib/mysql + +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M + +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +# Recommended in standard MySQL setup +sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + +[mysqld_safe] +log-error = /var/log/mysqld.log +pid-file = /run/mysqld/mysqld.pid Deleted: community-i686/mysql-user.conf =================================================================== --- community-i686/mysql-user.conf 2015-09-17 10:10:25 UTC (rev 140393) +++ community-i686/mysql-user.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -1 +0,0 @@ -u mysql 89 "MySQL user" Copied: percona-server/repos/community-i686/mysql-user.conf (from rev 140393, percona-server/trunk/mysql-user.conf) =================================================================== --- community-i686/mysql-user.conf (rev 0) +++ community-i686/mysql-user.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1 @@ +u mysql 89 "MySQL user" Deleted: community-i686/mysql56-bufsize.patch =================================================================== --- community-i686/mysql56-bufsize.patch 2015-09-17 10:10:25 UTC (rev 140393) +++ community-i686/mysql56-bufsize.patch 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,20 +0,0 @@ ---- storage/innobase/row/row0log.cc.orig 2013-10-14 09:44:46.060172260 +0200 -+++ storage/innobase/row/row0log.cc 2013-10-14 10:05:51.822170509 +0200 -@@ -2364,7 +2364,7 @@ - and be ignored when the operation is unsupported. */ - fallocate(index->online_log->fd, - FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, -- ofs, srv_buf_size); -+ ofs, srv_sort_buf_size); - #endif /* FALLOC_FL_PUNCH_HOLE */ - - next_mrec = index->online_log->head.block; -@@ -3153,7 +3153,7 @@ - and be ignored when the operation is unsupported. */ - fallocate(index->online_log->fd, - FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, -- ofs, srv_buf_size); -+ ofs, srv_sort_buf_size); - #endif /* FALLOC_FL_PUNCH_HOLE */ - - next_mrec = index->online_log->head.block; Copied: percona-server/repos/community-i686/mysql56-bufsize.patch (from rev 140393, percona-server/trunk/mysql56-bufsize.patch) =================================================================== --- community-i686/mysql56-bufsize.patch (rev 0) +++ community-i686/mysql56-bufsize.patch 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,20 @@ +--- storage/innobase/row/row0log.cc.orig 2013-10-14 09:44:46.060172260 +0200 ++++ storage/innobase/row/row0log.cc 2013-10-14 10:05:51.822170509 +0200 +@@ -2364,7 +2364,7 @@ + and be ignored when the operation is unsupported. */ + fallocate(index->online_log->fd, + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, +- ofs, srv_buf_size); ++ ofs, srv_sort_buf_size); + #endif /* FALLOC_FL_PUNCH_HOLE */ + + next_mrec = index->online_log->head.block; +@@ -3153,7 +3153,7 @@ + and be ignored when the operation is unsupported. */ + fallocate(index->online_log->fd, + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, +- ofs, srv_buf_size); ++ ofs, srv_sort_buf_size); + #endif /* FALLOC_FL_PUNCH_HOLE */ + + next_mrec = index->online_log->head.block; Deleted: community-i686/mysqld-tmpfile.conf =================================================================== --- community-i686/mysqld-tmpfile.conf 2015-09-17 10:10:25 UTC (rev 140393) +++ community-i686/mysqld-tmpfile.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -1 +0,0 @@ -d /run/mysqld 0755 mysql mysql - \ No newline at end of file Copied: percona-server/repos/community-i686/mysqld-tmpfile.conf (from rev 140393, percona-server/trunk/mysqld-tmpfile.conf) =================================================================== --- community-i686/mysqld-tmpfile.conf (rev 0) +++ community-i686/mysqld-tmpfile.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - \ No newline at end of file Deleted: community-i686/percona.install =================================================================== --- community-i686/percona.install 2015-09-17 10:10:25 UTC (rev 140393) +++ community-i686/percona.install 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,25 +0,0 @@ -if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then - datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") -fi -[[ -z $datadir ]] && datadir=/var/lib/mysql - -post_install(){ - systemd-sysusers mysql.conf - - if [[ ! -e $datadir ]]; then - install -dm700 $datadir - mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir - fi - - systemd-tmpfiles --create mysqld.conf -} - -post_upgrade(){ - systemd-sysusers mysql.conf - - if [ "$(vercmp $2 5.6)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} Copied: percona-server/repos/community-i686/percona.install (from rev 140393, percona-server/trunk/percona.install) =================================================================== --- community-i686/percona.install (rev 0) +++ community-i686/percona.install 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,25 @@ +if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then + datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") +fi +[[ -z $datadir ]] && datadir=/var/lib/mysql + +post_install(){ + systemd-sysusers mysql.conf + + if [[ ! -e $datadir ]]; then + install -dm700 $datadir + mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir + fi + + systemd-tmpfiles --create mysqld.conf +} + +post_upgrade(){ + systemd-sysusers mysql.conf + + if [ "$(vercmp $2 5.6)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-09-17 10:10:25 UTC (rev 140393) +++ community-x86_64/PKGBUILD 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,151 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgbase=percona-server -pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') -pkgver=5.6.25_73.1 -_pkgver=${pkgver/_/-} -_myver=${pkgver/_rel*} -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools') -license=('GPL') -url="http://www.percona.com/software/percona-server/" -source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" - 'my.cnf' - 'mysql-user.conf' - 'mysqld-tmpfile.conf' - 'mysql56-bufsize.patch') - -prepare() { - cd $pkgbase-$_pkgver - patch -p0 -i ../mysql56-bufsize.patch - rm -v sql/sql_yacc.{cc,h} - sed 's|$datadir/mysql.sock|/run/mysqld/mysqld.sock|' \ - -i packaging/rpm-fedora/mysql-systemd-start -} - -build() { - rm -rf build - mkdir build - cd build - - cmake ../$pkgbase-$_pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_CONFIG=mysql_release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -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=lib/mysql/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/perconaserver \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_PAM=ON \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNODB_MEMCACHED=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=ON \ - -DWITH_PARTITION_STORAGE_ENGINE=ON \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ - -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ - -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ - -DWITH_FEDERATED_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" \ - -DWITH_MYSQLD_LDFLAGS="$LDFLAGS" - - make -} - -package_libperconaserverclient() { - pkgdesc='Percona Server client libraries' - depends=('openssl') - - cd build - for dir in include libmysql libmysqld libservices; do - make -C $dir DESTDIR="$pkgdir" install - done - - rm "$pkgdir"/usr/lib/libmysqlservices.a - - install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config - install -d "$pkgdir"/usr/share/man/man1 - install -m644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 -} - -package_percona-server-clients() { - pkgdesc='Percona Server client tools' - depends=('libperconaserverclient' 'zlib') - conflicts=('mysql-clients') - provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") - - cd build - make -C client DESTDIR="$pkgdir" install - - # install man pages - install -d "$pkgdir"/usr/share/man/man1 - for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 - done - - # provided by percona-server - rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest,mysql_config_editor} -} - -package_percona-server() { - pkgdesc='A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation' - backup=('etc/mysql/my.cnf') - install=percona.install - depends=('percona-server-clients' 'libaio' 'systemd-tools' 'pam') - optdepends=('perl-dbd-mysql') - conflicts=('mysql') - provides=("mysql=$_myver" "mariadb=$_myver") - options=('emptydirs') - - cd build - make DESTDIR="$pkgdir" install - - install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf - install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf - install -Dm644 ../mysqld-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysqld.conf - - cd ../$pkgbase-$_pkgver/packaging/rpm-fedora - install -Dm755 mysql-systemd-start "$pkgdir"/usr/bin/mysql-systemd-start - install -Dm644 mysqld.service "$pkgdir"/usr/lib/systemd/system/mysqld.service - - # provided by libperconaserverclient - cd "$pkgdir" - rm usr/bin/mysql_config - rm usr/lib/lib{mysql,perconaserver}* - rm -r usr/include/ - rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - - # provided by percona-server-clients - rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 - - # not needed - rm -r usr/{data,mysql-test,sql-bench} - rm usr/share/man/man1/mysql-test-run.pl.1 -} - -sha256sums=('5a0d88465e4bb081e621b06bc943fafadb4c67a2cca50839b44fcd94ae793b50' - 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' - 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' - 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' - '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729') Copied: percona-server/repos/community-x86_64/PKGBUILD (from rev 140393, percona-server/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,154 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgbase=percona-server +pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') +pkgver=5.6.26_74.0 +_pkgver=${pkgver/_/-} +_myver=${pkgver/_rel*} +pkgrel=1 +arch=('i686' 'x86_64') +# valgrind necessary for bug https://bugs.launchpad.net/percona-server/+bug/1494283 +makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'systemd-tools' 'valgrind') +license=('GPL') +url="http://www.percona.com/software/percona-server/" +source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" + 'my.cnf' + 'mysql-user.conf' + 'mysqld-tmpfile.conf' + 'mysql56-bufsize.patch') + +prepare() { + cd $pkgbase-$_pkgver + patch -p0 -i ../mysql56-bufsize.patch + rm -v sql/sql_yacc.{cc,h} + sed 's|$datadir/mysql.sock|/run/mysqld/mysqld.sock|' \ + -i packaging/rpm-fedora/mysql-systemd-start + sed 's|${fullhostname}|"archbuild"|' \ + -i storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake +} + +build() { + rm -rf build + mkdir build + cd build + + cmake ../$pkgbase-$_pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_CONFIG=mysql_release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -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=lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/perconaserver \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_DOCDIR=share/mysql/docs \ + -DINSTALL_SHAREDIR=share/mysql \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_UNIT_TESTS=OFF \ + -DWITH_PAM=ON \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNODB_MEMCACHED=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=ON \ + -DWITH_PARTITION_STORAGE_ENGINE=ON \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ + -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ + -DWITH_FEDERATED_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" \ + -DWITH_MYSQLD_LDFLAGS="$LDFLAGS" + + make +} + +package_libperconaserverclient() { + pkgdesc='Percona Server client libraries' + depends=('openssl') + + cd build + for dir in include libmysql libmysqld libservices; do + make -C $dir DESTDIR="$pkgdir" install + done + + rm "$pkgdir"/usr/lib/libmysqlservices.a + + install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config + install -d "$pkgdir"/usr/share/man/man1 + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1 +} + +package_percona-server-clients() { + pkgdesc='Percona Server client tools' + depends=('libperconaserverclient' 'zlib') + conflicts=('mysql-clients') + provides=("mysql-clients=$_myver" "mariadb-clients=$_myver") + + cd build + make -C client DESTDIR="$pkgdir" install + + # install man pages + install -d "$pkgdir"/usr/share/man/man1 + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + done + + # provided by percona-server + rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest,mysql_config_editor} +} + +package_percona-server() { + pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and TokuDB storage engine' + backup=('etc/mysql/my.cnf') + install=percona.install + depends=('percona-server-clients' 'libaio' 'systemd-tools' 'pam') + optdepends=('perl-dbd-mysql') + conflicts=('mysql') + provides=("mysql=$_myver" "mariadb=$_myver") + options=('emptydirs') + + cd build + make DESTDIR="$pkgdir" install + + install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf + install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf + install -Dm644 ../mysqld-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysqld.conf + + cd ../$pkgbase-$_pkgver/packaging/rpm-fedora + install -Dm755 mysql-systemd-start "$pkgdir"/usr/bin/mysql-systemd-start + install -Dm644 mysqld.service "$pkgdir"/usr/lib/systemd/system/mysqld.service + + # provided by libperconaserverclient + cd "$pkgdir" + rm usr/bin/mysql_config + rm usr/lib/lib{mysql,perconaserver}* + rm -r usr/include/ + rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + + # provided by percona-server-clients + rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # not needed + rm -r usr/{data,mysql-test,sql-bench} + rm usr/share/man/man1/mysql-test-run.pl.1 +} + +sha256sums=('9156038d84bd1190a5b5df963877876584d30bd515ba3ad39e65a532430c1608' + 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' + 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' + 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' + '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729') Deleted: community-x86_64/my.cnf =================================================================== --- community-x86_64/my.cnf 2015-09-17 10:10:25 UTC (rev 140393) +++ community-x86_64/my.cnf 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,38 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html - -[client] -#password = your_password -port = 3306 -socket = /run/mysqld/mysqld.sock - -[mysqld] -port = 3306 -socket = /run/mysqld/mysqld.sock -datadir = /var/lib/mysql - -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# Recommended in standard MySQL setup -sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -[mysqld_safe] -log-error = /var/log/mysqld.log -pid-file = /run/mysqld/mysqld.pid Copied: percona-server/repos/community-x86_64/my.cnf (from rev 140393, percona-server/trunk/my.cnf) =================================================================== --- community-x86_64/my.cnf (rev 0) +++ community-x86_64/my.cnf 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,38 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html + +[client] +#password = your_password +port = 3306 +socket = /run/mysqld/mysqld.sock + +[mysqld] +port = 3306 +socket = /run/mysqld/mysqld.sock +datadir = /var/lib/mysql + +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M + +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +# Recommended in standard MySQL setup +sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + +[mysqld_safe] +log-error = /var/log/mysqld.log +pid-file = /run/mysqld/mysqld.pid Deleted: community-x86_64/mysql-user.conf =================================================================== --- community-x86_64/mysql-user.conf 2015-09-17 10:10:25 UTC (rev 140393) +++ community-x86_64/mysql-user.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -1 +0,0 @@ -u mysql 89 "MySQL user" Copied: percona-server/repos/community-x86_64/mysql-user.conf (from rev 140393, percona-server/trunk/mysql-user.conf) =================================================================== --- community-x86_64/mysql-user.conf (rev 0) +++ community-x86_64/mysql-user.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1 @@ +u mysql 89 "MySQL user" Deleted: community-x86_64/mysql56-bufsize.patch =================================================================== --- community-x86_64/mysql56-bufsize.patch 2015-09-17 10:10:25 UTC (rev 140393) +++ community-x86_64/mysql56-bufsize.patch 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,20 +0,0 @@ ---- storage/innobase/row/row0log.cc.orig 2013-10-14 09:44:46.060172260 +0200 -+++ storage/innobase/row/row0log.cc 2013-10-14 10:05:51.822170509 +0200 -@@ -2364,7 +2364,7 @@ - and be ignored when the operation is unsupported. */ - fallocate(index->online_log->fd, - FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, -- ofs, srv_buf_size); -+ ofs, srv_sort_buf_size); - #endif /* FALLOC_FL_PUNCH_HOLE */ - - next_mrec = index->online_log->head.block; -@@ -3153,7 +3153,7 @@ - and be ignored when the operation is unsupported. */ - fallocate(index->online_log->fd, - FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, -- ofs, srv_buf_size); -+ ofs, srv_sort_buf_size); - #endif /* FALLOC_FL_PUNCH_HOLE */ - - next_mrec = index->online_log->head.block; Copied: percona-server/repos/community-x86_64/mysql56-bufsize.patch (from rev 140393, percona-server/trunk/mysql56-bufsize.patch) =================================================================== --- community-x86_64/mysql56-bufsize.patch (rev 0) +++ community-x86_64/mysql56-bufsize.patch 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,20 @@ +--- storage/innobase/row/row0log.cc.orig 2013-10-14 09:44:46.060172260 +0200 ++++ storage/innobase/row/row0log.cc 2013-10-14 10:05:51.822170509 +0200 +@@ -2364,7 +2364,7 @@ + and be ignored when the operation is unsupported. */ + fallocate(index->online_log->fd, + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, +- ofs, srv_buf_size); ++ ofs, srv_sort_buf_size); + #endif /* FALLOC_FL_PUNCH_HOLE */ + + next_mrec = index->online_log->head.block; +@@ -3153,7 +3153,7 @@ + and be ignored when the operation is unsupported. */ + fallocate(index->online_log->fd, + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, +- ofs, srv_buf_size); ++ ofs, srv_sort_buf_size); + #endif /* FALLOC_FL_PUNCH_HOLE */ + + next_mrec = index->online_log->head.block; Deleted: community-x86_64/mysqld-tmpfile.conf =================================================================== --- community-x86_64/mysqld-tmpfile.conf 2015-09-17 10:10:25 UTC (rev 140393) +++ community-x86_64/mysqld-tmpfile.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -1 +0,0 @@ -d /run/mysqld 0755 mysql mysql - \ No newline at end of file Copied: percona-server/repos/community-x86_64/mysqld-tmpfile.conf (from rev 140393, percona-server/trunk/mysqld-tmpfile.conf) =================================================================== --- community-x86_64/mysqld-tmpfile.conf (rev 0) +++ community-x86_64/mysqld-tmpfile.conf 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - \ No newline at end of file Deleted: community-x86_64/percona.install =================================================================== --- community-x86_64/percona.install 2015-09-17 10:10:25 UTC (rev 140393) +++ community-x86_64/percona.install 2015-09-17 10:10:59 UTC (rev 140394) @@ -1,25 +0,0 @@ -if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then - datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") -fi -[[ -z $datadir ]] && datadir=/var/lib/mysql - -post_install(){ - systemd-sysusers mysql.conf - - if [[ ! -e $datadir ]]; then - install -dm700 $datadir - mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir - fi - - systemd-tmpfiles --create mysqld.conf -} - -post_upgrade(){ - systemd-sysusers mysql.conf - - if [ "$(vercmp $2 5.6)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} Copied: percona-server/repos/community-x86_64/percona.install (from rev 140393, percona-server/trunk/percona.install) =================================================================== --- community-x86_64/percona.install (rev 0) +++ community-x86_64/percona.install 2015-09-17 10:10:59 UTC (rev 140394) @@ -0,0 +1,25 @@ +if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then + datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") +fi +[[ -z $datadir ]] && datadir=/var/lib/mysql + +post_install(){ + systemd-sysusers mysql.conf + + if [[ ! -e $datadir ]]; then + install -dm700 $datadir + mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir + fi + + systemd-tmpfiles --create mysqld.conf +} + +post_upgrade(){ + systemd-sysusers mysql.conf + + if [ "$(vercmp $2 5.6)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +}