- rel 2; drop fpermissive

diff --git a/mysql-build.patch b/mysql-build.patch
index e9c2efd25f0fce4c99cf346b42e3eb50fc65c46a..7c87749ca5e60259b6c40aba88e8b3b630b24561 100644 (file)
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -91,3 +91,15 @@ diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
  
  set(USE_VALGRIND OFF CACHE BOOL "whether to use valgrind headers")
  if (USE_VALGRIND)
+--- percona-server-5.6.37-82.2/sql-common/client_authentication.cc~    2017-08-24 13:30:44.000000000 +0200
++++ percona-server-5.6.37-82.2/sql-common/client_authentication.cc     2017-10-10 07:08:19.782991745 +0200
+@@ -83,8 +83,7 @@ RSA *rsa_init(MYSQL *mysql)
+   FILE *pub_key_file= NULL;
+ 
+   if (mysql->options.extension != NULL &&
+-      mysql->options.extension->server_public_key_path != NULL &&
+-      mysql->options.extension->server_public_key_path != '\0')
++      mysql->options.extension->server_public_key_path != NULL)
+   {
+     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
+                         "r");

diff --git a/mysql.spec b/mysql.spec
index 0f4d7a3047e4b427391a228d52a3b3150ace1e49..8a75d40c2c2c93db61ccdecf0ac374c870881ce3 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -30,7 +30,7 @@
 %undefine      with_tokudb
 %endif
 
-%define                rel     1
+%define                rel     2
 %define                percona_rel     82.2
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
@@ -571,7 +571,7 @@ CPPFLAGS="%{rpmcppflags}" \
 %cmake .. \
        -DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
        -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
-       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive" \
+       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
        -DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \
        -DCURSES_INCLUDE_PATH=/usr/include/ncurses \
        %{?with_systemtap:-DENABLE_DTRACE=ON} \