Merge lp:~percona-core/percona-server/release-5.6.21-69.0 into lp:percona-server/5.6

[Tomislav Plavcic]

Release branch for PS version 5.6.21-69.0

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2014-09-26 04:43:24 +0000
+++ build-ps/debian/control	2014-10-07 16:28:28 +0000
@@ -158,6 +158,7 @@
         mysql-server-5.5,
         mysql-server-5.6,
         mysql-server-core-5.1,
+        mysql-server-core-5.5,
         percona-xtradb-server-5.0,
         percona-server-server-5.1,
         percona-server-server-5.5,
@@ -171,6 +172,7 @@
           mysql-server-5.5,
           mysql-server-5.6,
           mysql-server-core-5.1,
+          mysql-server-core-5.5,
           percona-xtradb-server-5.0,
           percona-server-server-5.1,
           percona-server-server-5.5,

=== modified file 'build-ps/debian/control.tokudb'
--- build-ps/debian/control.tokudb	2014-05-23 00:24:00 +0000
+++ build-ps/debian/control.tokudb	2014-10-07 16:28:28 +0000
@@ -172,6 +172,7 @@
         mysql-server-5.5,
         mysql-server-5.6,
         mysql-server-core-5.1,
+        mysql-server-core-5.5,
         percona-xtradb-server-5.0,
         percona-server-server-5.1,
         percona-server-server-5.5,
@@ -185,6 +186,7 @@
           mysql-server-5.5,
           mysql-server-5.6,
           mysql-server-core-5.1,
+          mysql-server-core-5.5,
           percona-xtradb-server-5.0,
           percona-server-server-5.1,
           percona-server-server-5.5,

=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-09-26 13:47:55 +0000
+++ build-ps/percona-server.spec	2014-10-07 16:28:28 +0000
@@ -61,6 +61,14 @@
 
 %define release         rel%{percona_server_version}%{?dist}
 
+%if "%rhel" > "6"
+%define shared_lib_pri_name libmysqlclient
+%define shared_lib_sec_name libperconaserverclient
+%else
+%define shared_lib_pri_name libperconaserverclient
+%define shared_lib_sec_name libmysqlclient
+%endif
+
 #
 # Macros we use which are not available in all supported versions of RPM
 #
@@ -263,6 +271,7 @@
 %if 0%{?systemd}
 BuildRequires:  systemd
 %endif
+Patch0:         mysql-5.6-sharedlib-rename.patch
 
 # Think about what you use here since the first step is to
 # run a rm -rf
@@ -396,11 +405,19 @@
 %package -n Percona-Server-shared%{product_suffix}
 Summary:        Percona Server - Shared libraries
 Group:          Applications/Databases
+%if "%rhel" > "6"
+Provides:       mysql-shared mysql-libs
+Obsoletes:      mariadb-libs
+Conflicts:      Percona-Server-shared-55
+%else
 %ifarch x86_64
 Provides:       libmysqlclient.so.18()(64bit)
+Provides:       libmysqlclient.so.18(libmysqlclient_18)(64bit)
 %endif
 %ifarch i386 i686
 Provides:       libmysqlclient.so.18()(32bit)
+Provides:       libmysqlclient.so.18(libmysqlclient_18)(32bit)
+%endif
 %endif
 
 %description -n Percona-Server-shared%{product_suffix}
@@ -413,6 +430,11 @@
 %if %{with tokudb}
 %setup -n %{src_dir} -T -D -b 1
 %endif
+
+%if "%rhel" > "6"
+%patch0 -p1
+%endif
+
 ##############################################################################
 %build
 
@@ -580,11 +602,16 @@
 install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
 %if 0%{?systemd}
 install -D -m 0755 $MBD/build-ps/rpm/mysql-systemd $RBR%{_bindir}/mysql-systemd
-install -D -m 0644 $MBD/build-ps/rpm/mysql.service $RBR%{_unitdir}/mysql.service
+install -D -m 0644 $MBD/build-ps/rpm/mysqld.service $RBR%{_unitdir}/mysqld.service
+install -D -m 0644 $MBD/build-ps/rpm/mysql.conf $RBR%{_tmpfilesdir}/mysql.conf
 %else
 install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
 %endif
 
+%if "%rhel" > "6"
+install -D -m 0644 $MBD/build-ps/rpm/my.cnf $RBR%{_sysconfdir}/my.cnf
+%endif
+
 #
 %{__rm} -f $RBR/%{_prefix}/README*
 #
@@ -598,7 +625,7 @@
 
 # Touch the place where the my.cnf config file might be located
 # Just to make sure it's in the file list and marked as a config file
-touch $RBR%{_sysconfdir}/my.cnf
+# touch $RBR%{_sysconfdir}/my.cnf
 
 # Install SELinux files in datadir
 install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \
@@ -625,15 +652,6 @@
 
 %pre -n Percona-Server-server%{product_suffix}
 
-# On rhel7 change default MariaDB options if they exists (only on initial installation)
-%if "%rhel" > "6"
-if [ $1 -eq 1 -a -f /etc/my.cnf ]; then
-  sed -i 's/log-error=\/var\/log\/mariadb\/mariadb.log/log-error=\/var\/log\/mysqld.log/g' /etc/my.cnf;
-  sed -i 's/pid-file=\/var\/run\/mariadb\/mariadb.pid/pid-file=\/var\/run\/mysqld\/mysqld.pid/g' /etc/my.cnf;
-  sed -i 's/\!includedir \/etc\/my.cnf.d/\#\!includedir \/etc\/my.cnf.d/g' /etc/my.cnf;
-fi
-%endif
-
 # ATTENTION: Parts of this are duplicated in the "triggerpostun" !
 
 # There are users who deviate from the default file system layout.
@@ -789,20 +807,11 @@
 # Note we *could* make that depend on $SERVER_TO_START, but we rather don't,
 # so a "stop" is attempted even if there is no PID file.
 # (Maybe the "stop" doesn't work then, but we might fix that in itself.)
-%if 0%{?systemd}
-SYSD_ACTIVE=$(systemctl is-active mysql)
-if [ $SYSD_ACTIVE == "active" ] ; then
-	%{_bindir}/systemctl stop mysql >/dev/null 2>&1
-	echo "Giving mysqld 5 seconds to exit nicely"
-	sleep 5
-fi
-%else
 if [ -x %{_sysconfdir}/init.d/mysql ] ; then
         %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1
         echo "Giving mysqld 5 seconds to exit nicely"
         sleep 5
 fi
-%endif
 
 # SElinux
 %post -n Percona-Server-selinux%{product_suffix}
@@ -817,6 +826,10 @@
 
 %post -n Percona-Server-server%{product_suffix}
 
+%if 0%{?systemd}
+  %systemd_post mysqld
+%endif
+
 # ATTENTION: Parts of this are duplicated in the "triggerpostun" !
 
 # There are users who deviate from the default file system layout.
@@ -852,7 +865,7 @@
 # use chkconfig on Enterprise Linux and newer SuSE releases
 %if 0%{?systemd}
 if [ -x %{_bindir}/systemctl ] ; then
-	%{_bindir}/systemctl enable mysql >/dev/null 2>&1
+	%{_bindir}/systemctl enable mysqld >/dev/null 2>&1
 fi
 %else
 if [ -x /sbin/chkconfig ] ; then
@@ -893,6 +906,10 @@
             --datadir=$mysql_datadir
     fi
 
+%if 0%{?systemd}
+  %tmpfiles_create mysql.conf
+%endif
+
 # ----------------------------------------------------------------------
 # Upgrade databases if needed would go here - but it cannot be automated yet
 # ----------------------------------------------------------------------
@@ -919,21 +936,18 @@
   sbin/restorecon -R var/lib/mysql
 fi
 
+# For systemd check postun
+%if 0%{?systemd} == 0
 # Was the server running before the upgrade? If so, restart the new one.
 if [ "$SERVER_TO_START" = "true" ] ; then
-%if 0%{?systemd}
-if [ -x %{_bindir}/systemctl ] ; then
-	%{_bindir}/systemctl start mysql
-fi
-%else
 	# Restart in the same way that mysqld will be started normally.
 	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
 		%{_sysconfdir}/init.d/mysql start
+		echo "Giving mysqld 5 seconds to start"
+		sleep 5
 	fi
+fi
 %endif
-  echo "Giving mysqld 5 seconds to start"
-  sleep 5
-fi
 
 echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
 echo "Run the following commands to create these functions:"
@@ -970,12 +984,9 @@
 
 if [ $1 = 0 ] ; then
 %if 0%{?systemd}
-	if [ -x %{_bindir}/systemctl ] ; then
-		%{_bindir}/systemctl stop mysql > /dev/null
-		%{_bindir}/systemctl disable mysql > /dev/null
-	fi
+	%systemd_preun mysqld
 %else
-        # Stop MySQL before uninstalling it
+       # Stop MySQL before uninstalling it
         if [ -x %{_sysconfdir}/init.d/mysql ] ; then
                 %{_sysconfdir}/init.d/mysql stop > /dev/null
                 # Remove autostart of MySQL
@@ -1032,7 +1043,7 @@
 
 %if 0%{?systemd}
 if [ -x %{_bindir}/systemctl ] ; then
-	%{_bindir}/systemctl enable mysql >/dev/null 2>&1
+	%{_bindir}/systemctl enable mysqld >/dev/null 2>&1
 fi
 %else
 if [ -x /sbin/chkconfig ] ; then
@@ -1048,7 +1059,7 @@
 # Restart in the same way that mysqld will be started normally.
 %if 0%{?systemd}
 	if [ -x %{_bindir}/systemctl ] ; then 
-		%{_bindir}/systemctl start mysql
+		%{_bindir}/systemctl start mysqld
 		echo "Giving mysqld 5 seconds to start"
 		sleep 5
 	fi
@@ -1086,9 +1097,13 @@
 	echo "* See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details"
 	echo ""
 fi
-%endif
 # ----------------------------------------------------------------------------
+%endif
 
+%postun -n Percona-Server-server%{product_suffix}
+%if 0%{?systemd}
+%systemd_postun_with_restart mysqld
+%endif
 
 # ----------------------------------------------------------------------
 # Clean up the BuildRoot after build is done
@@ -1146,8 +1161,6 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
 %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
 
-%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
-
 %attr(755, root, root) %{_bindir}/innochecksum
 %attr(755, root, root) %{_bindir}/my_print_defaults
 %attr(755, root, root) %{_bindir}/myisam_ftdump
@@ -1241,7 +1254,9 @@
 
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %if 0%{?systemd}
-%attr(644, root, root) %{_unitdir}/mysql.service
+%attr(755, root, root) %{_bindir}/mysql-systemd
+%attr(644, root, root) %{_unitdir}/mysqld.service
+%attr(644, root, root) %{_tmpfilesdir}/mysql.conf
 %else
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
 %endif
@@ -1332,8 +1347,8 @@
 %dir %attr(755, root, root) %{_libdir}/mysql
 %{_includedir}/mysql/*
 %{_datadir}/aclocal/mysql.m4
-%{_libdir}/mysql/libperconaserverclient.a
-%{_libdir}/mysql/libperconaserverclient_r.a
+%{_libdir}/mysql/%{shared_lib_pri_name}.a
+%{_libdir}/mysql/%{shared_lib_pri_name}_r.a
 %{_libdir}/mysql/libmysqlservices.a
 %{_libdir}/*.so
 
@@ -1350,18 +1365,30 @@
 %files -n Percona-Server-shared%{product_suffix}
 %defattr(-, root, root, 0755)
 # Shared libraries (omit for architectures that don't support them)
-%{_libdir}/libperconaserver*.so.*
+%{_libdir}/%{shared_lib_pri_name}*.so.*
+
+%if "%rhel" > "6"
+%attr(644, root, root) %config(noreplace) %{_sysconfdir}/my.cnf
+%endif
 
 %post -n Percona-Server-shared%{product_suffix}
+%if "%rhel" > "6"
 # Added for compatibility
-for lib in libmysqlclient{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do
+for lib in %{shared_lib_pri_name}{.so.18,_r.so.18}; do
+    if [ ! -f %{_libdir}/$lib ]; then
+        ln -s %{shared_lib_pri_name}.so.18.1.0 %{_libdir}/$lib
+    fi
+done
+%endif
+# For compatibility between different names of library
+for lib in %{shared_lib_sec_name}{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do
 if [ ! -f %{_libdir}/$lib ]; then
-        ln -s libperconaserverclient.so.18 %{_libdir}/$lib;
+        ln -s %{shared_lib_pri_name}.so.18 %{_libdir}/$lib;
 fi
 done
-for lib in libmysqlclient{.so.18.1.0,_r.so.18.1.0}; do
+for lib in %{shared_lib_sec_name}{.so.18.1.0,_r.so.18.1.0}; do
 if [ ! -f %{_libdir}/$lib ]; then
-        ln -s libperconaserverclient.so.18.1.0 %{_libdir}/$lib;
+        ln -s %{shared_lib_pri_name}.so.18.1.0 %{_libdir}/$lib;
 fi
 done
 

=== added file 'build-ps/rpm/my.cnf'
--- build-ps/rpm/my.cnf	1970-01-01 00:00:00 +0000
+++ build-ps/rpm/my.cnf	2014-10-07 16:28:28 +0000
@@ -0,0 +1,30 @@
+# Percona Server template configuration
+
+[mysqld]
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# Recommended in standard MySQL setup
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+[mysqld_safe]
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid

=== added file 'build-ps/rpm/mysql-5.6-sharedlib-rename.patch'
--- build-ps/rpm/mysql-5.6-sharedlib-rename.patch	1970-01-01 00:00:00 +0000
+++ build-ps/rpm/mysql-5.6-sharedlib-rename.patch	2014-10-07 16:28:28 +0000
@@ -0,0 +1,486 @@
+diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt
+--- old/client/CMakeLists.txt	2014-09-11 15:57:31.002299863 +0200
++++ new/client/CMakeLists.txt	2014-09-17 00:46:43.968870528 +0200
+@@ -32,48 +32,48 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+ 
+ ADD_DEFINITIONS(${SSL_DEFINES})
+ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
+-TARGET_LINK_LIBRARIES(mysql perconaserverclient)
++TARGET_LINK_LIBRARIES(mysql mysqlclient)
+ IF(UNIX)
+   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
+ ENDIF(UNIX)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+-TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
++TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ 
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
+-TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
++TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
+-TARGET_LINK_LIBRARIES(mysqldump perconaserverclient)
++TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
+-TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
++TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
+-TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
++TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+-TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
++TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+-TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
++TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
+                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
+-TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
++TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
+-TARGET_LINK_LIBRARIES(mysqladmin perconaserverclient)
++TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
+ SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
+-TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient)
++TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+ 
+ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
+-TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient)
++TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+ 
+ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
+ IF(WIN32)
+diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
+--- old/libmysql/CMakeLists.txt	2014-09-11 15:57:34.030299912 +0200
++++ new/libmysql/CMakeLists.txt	2014-09-16 23:57:09.240822303 +0200
+@@ -179,12 +179,12 @@ IF(WIN32)
+   LIST(APPEND LIBS auth_win_client)
+ ENDIF()
+ 
+-# Merge several convenience libraries into one big perconaserverclient
+-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
++# Merge several convenience libraries into one big mysqlclient
++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+ 
+ # Visual Studio users need debug  static library for debug projects
+ IF(MSVC)
+- INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)
++ INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
+ ENDIF()
+ 
+@@ -209,14 +209,14 @@ IF(UNIX)
+ ENDIF()
+ 
+ IF(UNIX)
+-  GET_TARGET_NAME(perconaserverclient lib_name)
+-  INSTALL_SYMLINK(perconaserverclient
+-    ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
++  GET_TARGET_NAME(mysqlclient lib_name)
++  INSTALL_SYMLINK(mysqlclient
++    ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
+     ${INSTALL_LIBDIR} Development)
+ ENDIF()
+ 
+ IF(NOT DISABLE_SHARED)
+-  # Merge several convenience libraries into one big perconaserverclient
++  # Merge several convenience libraries into one big mysqlclient
+   # and link them together into shared library.
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+     EXPORTS ${CLIENT_API_FUNCTIONS}
+@@ -229,9 +229,9 @@ IF(NOT DISABLE_SHARED)
+       SET(OS_SHARED_LIB_VERSION
+         "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
+     ENDIF()
+-    # Name of shared library is perconaserverclient on Unix
++    # Name of shared library is mysqlclient on Unix
+     SET_TARGET_PROPERTIES(libmysql PROPERTIES 
+-      OUTPUT_NAME perconaserverclient 
++      OUTPUT_NAME mysqlclient 
+       VERSION "${OS_SHARED_LIB_VERSION}" 
+       SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
+     CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
+@@ -248,13 +248,13 @@ IF(NOT DISABLE_SHARED)
+         PROPERTIES LINK_FLAGS "${libmysql_link_flags}")
+     ENDIF() 
+     # clean direct output needs to be set several targets have the same name
+-    #(perconaserverclient in this case)
+-    SET_TARGET_PROPERTIES(perconaserverclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++    #(mysqlclient in this case)
++    SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ 
+-    # Install links to libperconaserverclient.so (client_r)
++    # Install links to libmysqlclient.so (client_r)
+     GET_VERSIONED_LIBNAME(
+-      "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r"
++      "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
+       "${CMAKE_SHARED_LIBRARY_SUFFIX}"
+       ""
+       linkname)
+@@ -268,7 +268,7 @@ IF(NOT DISABLE_SHARED)
+     LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
+     FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
+       GET_VERSIONED_LIBNAME(
+-        "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r"
++        "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
+         "${CMAKE_SHARED_LIBRARY_SUFFIX}"
+         "${ver}"
+         linkname)
+diff -rup old/libmysql/libmysql.map new/libmysql/libmysql.map
+--- old/libmysql/libmysql.map	2014-09-11 15:57:34.030299912 +0200
++++ new/libmysql/libmysql.map	2014-09-11 16:04:17.866306459 +0200
+@@ -1,5 +1,5 @@
+ # symbols exported from mysql 5.1
+-libperconaserverclient_16 {
++libmysqlclient_16 {
+   global:
+ 	_fini;
+ 	_init;
+@@ -124,7 +124,7 @@ libperconaserverclient_16 {
+ 	*;
+ };
+ # symbols added in mysql 5.5
+-libperconaserverclient_18 {
++libmysqlclient_18 {
+   global:
+ 	mysql_client_find_plugin;
+ 	mysql_client_register_plugin;
+@@ -136,7 +136,7 @@ libperconaserverclient_18 {
+ # Ideally the following symbols wouldn't be exported, but various applications
+ # require them.  We limit the namespace damage by prefixing mysql_
+ # (see mysql-dubious-exports.patch), which means the symbols are not present
+-# in libperconaserverclient_16.
++# in libmysqlclient_16.
+ #
+ # mysql-connector-odbc requires these
+ 	mysql_default_charset_info;
+@@ -149,7 +149,7 @@ libperconaserverclient_18 {
+ 	my_net_read;
+ };
+ # symbols added in mysql 5.6
+-libperconaserverclient_18_1 {
++libmysqlclient_18_1 {
+   global:
+ 	get_tty_password;
+ };
+diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in
+--- old/libmysql/libmysql.ver.in	2014-09-11 15:57:34.030299912 +0200
++++ new/libmysql/libmysql.ver.in	2014-09-11 16:02:40.254304877 +0200
+@@ -1 +1 @@
+-libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
++libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
+diff -rup old/plugin/percona-pam-for-mysql/CMakeLists.txt new/plugin/percona-pam-for-mysql/CMakeLists.txt
+--- old/plugin/percona-pam-for-mysql/CMakeLists.txt	2014-09-11 15:57:34.094299913 +0200
++++ new/plugin/percona-pam-for-mysql/CMakeLists.txt	2014-09-17 01:06:48.308890052 +0200
+@@ -31,6 +31,6 @@ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE
+   SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c)
+   MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
+   MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
+-  MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES perconaserverclient MODULE_ONLY)
++  MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY)
+ ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
+ ENDIF(WITH_PAM)
+diff -rup old/scripts/CMakeLists.txt new/scripts/CMakeLists.txt
+--- old/scripts/CMakeLists.txt	2014-09-11 15:57:33.210299899 +0200
++++ new/scripts/CMakeLists.txt	2014-09-17 00:48:25.428872172 +0200
+@@ -253,7 +253,7 @@ ELSE()
+ ENDIF()
+ 
+ # Use cmake variables to inspect dependencies for 
+-# perconaserverclient library (add -l stuff)
++# mysqlclient library (add -l stuff)
+ SET(CLIENT_LIBS "")
+ SET(LIBS "")
+ 
+@@ -293,7 +293,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+   ENDIF()
+ ENDMACRO()
+ 
+-EXTRACT_LINK_LIBRARIES(perconaserverclient CLIENT_LIBS)
++EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS)
+ EXTRACT_LINK_LIBRARIES(mysqlserver LIBS)
+ 
+ # mysql_config evaluates ${LIBDL}, we want to avoid it
+diff -rup old/scripts/mysql_config.pl.in new/scripts/mysql_config.pl.in
+--- old/scripts/mysql_config.pl.in	2014-09-11 15:57:33.210299899 +0200
++++ new/scripts/mysql_config.pl.in	2014-09-17 00:50:09.804873864 +0200
+@@ -182,15 +182,15 @@ if ( $^O eq "MSWin32" )
+   my $linkpath   = "$pkglibdir";
+   # user32 is only needed for debug or embedded
+   my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib");
+-  @lib_opts   = ("$linkpath/perconaserverclient.lib",@winlibs);
++  @lib_opts   = ("$linkpath/mysqlclient.lib",@winlibs);
+   @lib_r_opts = @lib_opts;
+   @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs);
+ }
+ else
+ {
+   my $linkpath   = "-L$pkglibdir @RPATH_OPTION@";
+-  @lib_opts   = ($linkpath,"-lperconaserverclient");
+-  @lib_r_opts = ($linkpath,"-lperconaserverclient_r");
++  @lib_opts   = ($linkpath,"-lmysqlclient");
++  @lib_r_opts = ($linkpath,"-lmysqlclient_r");
+   @lib_e_opts = ($linkpath,"-lmysqld");
+ }
+ 
+diff -rup old/scripts/mysql_config.sh new/scripts/mysql_config.sh
+--- old/scripts/mysql_config.sh	2014-09-11 15:57:33.218299899 +0200
++++ new/scripts/mysql_config.sh	2014-09-17 00:51:04.160874746 +0200
+@@ -111,9 +111,9 @@ fi
+ 
+ # Create options 
+ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
+-libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
++libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+-libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
++libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+ embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
+ embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@"
+ 
+diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile
+--- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2014-09-11 15:57:33.850299909 +0200
++++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2014-09-17 00:56:44.060880256 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(OBJS): $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
+--- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2014-09-17 00:58:30.524881982 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(OBJS): $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2014-09-17 01:00:02.560883474 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2014-09-17 01:00:57.516884365 +0200
+@@ -28,7 +28,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile new/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile	2014-09-17 01:01:33.404884947 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile new/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile	2014-09-17 01:01:50.888885230 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(OBJS): $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2014-09-17 00:58:49.500882290 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS) Makefile
+ 	$(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile new/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile	2014-09-11 15:57:33.850299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile	2014-09-17 00:57:27.564880961 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(OBJS): $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2014-09-11 15:57:33.850299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2014-09-17 00:57:55.916881421 +0200
+@@ -28,7 +28,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS)  -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2014-09-11 15:57:33.850299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2014-09-17 00:56:07.200879658 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2014-09-11 15:57:33.850299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2014-09-17 00:56:24.332879936 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2014-09-11 15:57:33.850299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2014-09-17 00:57:08.236880648 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(OBJS): $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2014-09-17 00:59:43.080883158 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(OBJS): $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
+diff -rup old/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile new/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile	2014-09-11 15:57:33.854299909 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile	2014-09-17 01:01:15.132884650 +0200
+@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
+ 
+ $(OBJS): $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
+diff -rup old/storage/ndb/test/run-test/CMakeLists.txt new/storage/ndb/test/run-test/CMakeLists.txt
+--- old/storage/ndb/test/run-test/CMakeLists.txt	2014-09-11 15:57:33.390299902 +0200
++++ new/storage/ndb/test/run-test/CMakeLists.txt	2014-09-17 00:53:34.700877186 +0200
+@@ -32,7 +32,7 @@ IF(NOT WIN32)
+   ADD_DEFINITIONS(-DDEFAULT_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")
+ ENDIF()
+ ADD_EXECUTABLE(atrt main.cpp setup.cpp files.cpp db.cpp command.cpp)
+-TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient dbug mysys strings perconaserverclient)
++TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient dbug mysys strings mysqlclient)
+ 
+ INSTALL(TARGETS atrt DESTINATION mysql-test/ndb)
+ INSTALL(FILES   atrt-testBackup atrt-mysql-test-run DESTINATION bin)
+diff -rup old/support-files/MySQL-shared-compat.spec.sh new/support-files/MySQL-shared-compat.spec.sh
+--- old/support-files/MySQL-shared-compat.spec.sh	2014-09-11 15:57:34.062299913 +0200
++++ new/support-files/MySQL-shared-compat.spec.sh	2014-09-17 01:05:59.832889266 +0200
+@@ -82,7 +82,7 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-di
+ 
+ %files
+ %defattr(-, root, root)
+-%{_libdir}/libperconaserverclient*
++%{_libdir}/libmysqlclient*
+ 
+ # The spec file changelog only includes changes made to the spec file
+ # itself - note that they must be ordered by date (important when
+diff -rup old/support-files/mysql.spec.sh new/support-files/mysql.spec.sh
+--- old/support-files/mysql.spec.sh	2014-09-11 15:57:34.062299913 +0200
++++ new/support-files/mysql.spec.sh	2014-09-17 01:04:32.416887849 +0200
+@@ -690,7 +690,7 @@ A manual upgrade is required.
+   rpm -qa | grep -i '^mysql-'
+ 
+   You may choose to use 'rpm --nodeps -ev <package-name>' to remove
+-  the package which contains the perconaserverclient shared library.  The
++  the package which contains the mysqlclient shared library.  The
+   library will be reinstalled by the MySQL-shared-compat package.
+ - Install the new MySQL packages supplied by $myvendor
+ - Ensure that the MySQL server is started
+@@ -1173,8 +1173,8 @@ echo "====="
+ %dir %attr(755, root, root) %{_libdir}/mysql
+ %{_includedir}/mysql/*
+ %{_datadir}/aclocal/mysql.m4
+-%{_libdir}/mysql/libperconaserverclient.a
+-%{_libdir}/mysql/libperconaserverclient_r.a
++%{_libdir}/mysql/libmysqlclient.a
++%{_libdir}/mysql/libmysqlclient_r.a
+ %{_libdir}/mysql/libmysqlservices.a
+ 
+ # ----------------------------------------------------------------------------
+diff -rup old/tests/CMakeLists.txt new/tests/CMakeLists.txt
+--- old/tests/CMakeLists.txt	2014-09-11 15:57:34.050299913 +0200
++++ new/tests/CMakeLists.txt	2014-09-17 01:02:46.088886125 +0200
+@@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+ 
+ ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
+-TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient)
++TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)
+ SET_TARGET_PROPERTIES(mysql_client_test PROPERTIES LINKER_LANGUAGE CXX)
+ 
+ IF(WITH_UNIT_TESTS)
+   ADD_EXECUTABLE(bug25714 bug25714.c)
+-  TARGET_LINK_LIBRARIES(bug25714 perconaserverclient)
++  TARGET_LINK_LIBRARIES(bug25714 mysqlclient)
+   SET_TARGET_PROPERTIES(bug25714 PROPERTIES LINKER_LANGUAGE CXX)
+ ENDIF()
+ 

=== added file 'build-ps/rpm/mysql.conf'
--- build-ps/rpm/mysql.conf	1970-01-01 00:00:00 +0000
+++ build-ps/rpm/mysql.conf	2014-10-07 16:28:28 +0000
@@ -0,0 +1,1 @@
+d /var/run/mysqld 0755 mysql mysql -

=== renamed file 'build-ps/rpm/mysql.service' => 'build-ps/rpm/mysqld.service'
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-09-26 04:43:24 +0000
+++ storage/innobase/include/univ.i	2014-10-07 16:28:28 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 68.0
+#define PERCONA_INNODB_VERSION 69.0
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */