community/percona-server to 5.7.18_15-1

This commit is contained in:
Kevin Mihelich 2017-05-30 17:58:58 +00:00
parent a640574065
commit 32b20eef5c
2 changed files with 25 additions and 6 deletions

View file

@ -8,7 +8,7 @@
pkgbase=percona-server pkgbase=percona-server
pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server') pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
pkgver=5.7.18_14 pkgver=5.7.18_15
_boost_ver=1.59.0 _boost_ver=1.59.0
_pkgver=${pkgver/_/-} _pkgver=${pkgver/_/-}
_myver=${pkgver/_rel*} _myver=${pkgver/_rel*}
@ -20,11 +20,13 @@ url="https://www.percona.com/software/mysql-database/percona-server"
source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz" source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
"https://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz" "https://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz"
'my.cnf' 'my.cnf'
'mysql-user.conf') 'mysql-user.conf'
sha256sums=('4c617e2f9a1c601caebb5ff470c675e3d03ba3b8071cd3261ae24fe11671e3bd' boolcheck.patch)
sha256sums=('a95d5c79122a889300855483426483975445a247c4b3f9ed2a9a54f4b4cd60bc'
'47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac' '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac'
'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83' 'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83'
'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e') 'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
'19ec30af8d0a9ccf8d8eeb1147cda3f7583f8e6bc329d0e353bed99e990aa5bb')
# This ships with bundled SSL library until proper support for openssl 1.1.0 # This ships with bundled SSL library until proper support for openssl 1.1.0
# is available. # is available.
@ -36,8 +38,12 @@ prepare() {
cd $pkgbase-$_pkgver cd $pkgbase-$_pkgver
rm -v sql/sql_yacc.{cc,h} rm -v sql/sql_yacc.{cc,h}
sed 's|${fullhostname}|"archbuild"|' \ sed 's/${fullhostname}/"archbuild"/' -i storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake
-i storage/tokudb/PerconaFT/cmake_modules/TokuSetupCTest.cmake sed 's/-Werror//g' -i \
storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake \
plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt
patch -p1 -i "$srcdir"/boolcheck.patch
} }
build() { build() {

View file

@ -0,0 +1,13 @@
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 924ccd3..d5ce802 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -5221,7 +5221,7 @@ rec_loop:
reporting due to search views etc. */
if (prev_rec != NULL
&& prebuilt->m_mysql_handler->end_range != NULL
- && prebuilt->idx_cond == false && end_loop >= 100) {
+ && !prebuilt->idx_cond && end_loop >= 100) {
dict_index_t* key_index = prebuilt->index;
bool clust_templ_for_sec = false;