- up to 5.6.39-83.1 (GCC6 branch is a percona-server without GCC7 patches)

[packages/mysql.git] / mysql-versioning.patch

diff --git a/mysql-versioning.patch b/mysql-versioning.patch
index aaaa82839521e6c6ad923392defea8a4329318af..6d4ea8c8a4fec04d9be57bc893423da7b6fbe80d 100644 (file)
--- a/mysql-versioning.patch
+++ b/mysql-versioning.patch
@@ -1,18 +1,15 @@
-The symbol versioning solution for libmysqlclient in mysql 5.1 was pretty
-awful (export everything) and as of 5.5.8 the cmake build scripts have
-forgotten the issue entirely.  So we now maintain our own list of exported
-symbols and jam it into the build with this hack.
-
-
-diff -Naur mysql-5.5.8.orig/libmysql/CMakeLists.txt mysql-5.5.8/libmysql/CMakeLists.txt
---- mysql-5.5.8.orig/libmysql/CMakeLists.txt   2010-12-03 12:58:26.000000000 -0500
-+++ mysql-5.5.8/libmysql/CMakeLists.txt        2010-12-21 21:00:07.135311386 -0500
-@@ -197,7 +197,7 @@
-         SET(libmysql_link_flags)
-       ENDIF()
-       SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
--        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
-+        "${libmysql_link_flags} -Wl,--version-script=libmysql.version ${LINK_FLAG_NO_UNDEFINED}")
-     ENDIF() 
-     # clean direct output needs to be set several targets have the same name
-     #(mysqlclient in this case)
+--- Percona-Server-5.6.14-rel62.0//libmysql/libmysql.map       2013-10-30 17:14:14.270019272 +0100
++++ percona-server-5.6.16-64.1/libmysql/libmysql.map   2014-05-02 22:58:14.025317912 +0300
+@@ -145,6 +145,7 @@
+       mysql_net_realloc;
+ # PHP's mysqli.so requires this (via the ER() macro)
+       mysql_client_errors;
++      client_errors;
+ # mydumper requires this (added by remi)
+       my_net_read;
+ };
+@@ -155,2 +156,4 @@
+       get_tty_password;
++# for mysql-workbench 6.1
++      mysql_options4;
+ };