commit ffa5fd4b1c1ed56265c37031c5f0242fb17a4d30
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed Oct 11 12:32:18 2017 +0200
- disable implicit-fallthrough, too much comments to backport
mysql-build.patch | 12 ++++++++++++
mysql.spec | 8 ++++----
2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 0b7bbc0..fde318f 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -570,10 +570,10 @@ cd build
CPPFLAGS="%{rpmcppflags}" \
%cmake .. \
-DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
- -DCMAKE_C_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing
-Wimplicit-fallthrough=2" \
- -DCMAKE_CXX_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing
-Wimplicit-fallthrough=2" \
- -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG
-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=2" \
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG
-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=2" \
+ -DCMAKE_C_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing
-Wimplicit-fallthrough=0" \
+ -DCMAKE_CXX_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing
-Wimplicit-fallthrough=0" \
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG
-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG
-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
-DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \
-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
%{?with_systemtap:-DENABLE_DTRACE=ON} \
diff --git a/mysql-build.patch b/mysql-build.patch
index 0728f22..2d055f2 100644
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -71,3 +71,15 @@
{
pub_key_file= fopen(mysql->options.extension->server_public_key_path,
"r");
+
+--- percona-server-5.6.37-82.2/storage/innobase/include/page0zip.ic~
2017-08-24 13:30:44.000000000 +0200
++++ percona-server-5.6.37-82.2/storage/innobase/include/page0zip.ic
2017-10-11 12:27:12.098125815 +0200
+@@ -172,7 +172,7 @@ page_zip_rec_needs_ext(
+ ignored if zip_size == 0 */
+ ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
+ {
+- ut_ad(rec_size > comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES);
++ ut_ad(rec_size > (comp ? REC_N_NEW_EXTRA_BYTES :
REC_N_OLD_EXTRA_BYTES));
+ ut_ad(ut_is_2pow(zip_size));
+ ut_ad(comp || !zip_size);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/ffa5fd4b1c1ed56265c37031c5f0242fb17a4d30
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
