- disable implicit-fallthrough, too much comments to backport

diff --git a/mysql-build.patch b/mysql-build.patch
index 0728f22756c0cf5310365df7e12119d2b222d9fe..2d055f288d377e49469761ece703ba0884bec970 100644 (file)
--- 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);
+ 

diff --git a/mysql.spec b/mysql.spec
index 0b7bbc0878539a9ee062877a8146d93ac795649c..fde318fe43bdb6dec343a653637408bb176ef095 100644 (file)
--- 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} \