Date: Tuesday, February 23, 2016 @ 17:57:14 Author: mtorromeo Revision: 163223
Updated to 5.7.10 Modified: percona-server/trunk/PKGBUILD percona-server/trunk/percona.install Deleted: percona-server/trunk/mysql56-bufsize.patch percona-server/trunk/mysqld-tmpfile.conf -----------------------+ PKGBUILD | 39 +++++++++++++++++---------------------- mysql56-bufsize.patch | 20 -------------------- mysqld-tmpfile.conf | 1 - percona.install | 2 +- 4 files changed, 18 insertions(+), 44 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-23 16:54:04 UTC (rev 163222) +++ PKGBUILD 2016-02-23 16:57:14 UTC (rev 163223) @@ -3,7 +3,8 @@ pkgbase=percona-server pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') -pkgver=5.6.28_76.1 +pkgver=5.7.10_3 +_boost_ver=1.59.0 _pkgver=${pkgver/_/-} _myver=${pkgver/_rel*} pkgrel=1 @@ -13,17 +14,14 @@ license=('GPL' 'AGPL') 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" + "http://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz" 'my.cnf' - 'mysql-user.conf' - 'mysqld-tmpfile.conf' - 'mysql56-bufsize.patch') + 'mysql-user.conf') 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 } @@ -60,6 +58,7 @@ -DWITH_PAM=ON \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_EMBEDDED_SHARED_LIBRARY=ON \ -DWITH_INNODB_MEMCACHED=ON \ -DWITH_INNOBASE_STORAGE_ENGINE=ON \ -DWITH_PARTITION_STORAGE_ENGINE=ON \ @@ -68,9 +67,11 @@ -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" + -DWITH_SYSTEMD=1 \ + -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ + -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" \ + -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \ + -DWITH_BOOST="../boost_${_boost_ver//./_}" make } @@ -125,12 +126,7 @@ 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 - cd "$pkgdir" # Move documentation @@ -154,16 +150,15 @@ rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 # deprecated/unused - rm usr/bin/{replace,msql2mysql} - rm usr/share/man/man1/{replace,msql2mysql}.1 + rm usr/bin/replace + rm usr/share/man/man1/replace.1 # not needed - rm -r usr/{data,mysql-test,sql-bench} + rm -r usr/mysql-test rm usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('ab8ab794a58a82132645ae84b74de91c7f9a5bcf81f2162628ce8976a00a4fd4' +sha256sums=('d28e05f942c540aedad55eb17debfa40f0715c3222dec19e378f1d3cc6cfbb97' + '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac' 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' - 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e' - 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' - '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729') + 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e') Deleted: mysql56-bufsize.patch =================================================================== --- mysql56-bufsize.patch 2016-02-23 16:54:04 UTC (rev 163222) +++ mysql56-bufsize.patch 2016-02-23 16:57:14 UTC (rev 163223) @@ -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; Deleted: mysqld-tmpfile.conf =================================================================== --- mysqld-tmpfile.conf 2016-02-23 16:54:04 UTC (rev 163222) +++ mysqld-tmpfile.conf 2016-02-23 16:57:14 UTC (rev 163223) @@ -1 +0,0 @@ -d /run/mysqld 0755 mysql mysql - \ No newline at end of file Modified: percona.install =================================================================== --- percona.install 2016-02-23 16:54:04 UTC (rev 163222) +++ percona.install 2016-02-23 16:57:14 UTC (rev 163223) @@ -11,7 +11,7 @@ mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir fi - systemd-tmpfiles --create mysqld.conf + systemd-tmpfiles --create mysql.conf } post_upgrade(){