Merge lp:~percona-core/percona-server/release-5.5.40-36.1 into lp:percona-server/5.5

[Tomislav Plavcic]

Release branch for PS version 5.5.40-36.1

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'VERSION'
--- VERSION	2014-09-24 09:00:06 +0000
+++ VERSION	2014-10-07 16:27:15 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
 MYSQL_VERSION_PATCH=40
-MYSQL_VERSION_EXTRA=-36.0
+MYSQL_VERSION_EXTRA=-36.1

=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2014-08-22 10:09:55 +0000
+++ build-ps/build-binary.sh	2014-10-07 16:27:15 +0000
@@ -203,6 +203,7 @@
     cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \
         -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
         -DWITH_EMBEDDED_SERVER=OFF \
+        -DENABLE_DTRACE=OFF \
         -DFEATURE_SET=community \
         -DWITH_SSL="$WITH_SSL_TYPE" \
         -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \

=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2014-08-22 10:09:55 +0000
+++ build-ps/debian/control	2014-10-07 16:27:15 +0000
@@ -101,6 +101,7 @@
           virtual-mysql-client-core
 Breaks: mysql-client-5.0,
         mysql-client-core-5.1,
+        mysql-client-core-5.5,
         mysql-client-5.1,
         mysql-client-5.5,
         percona-xtradb-client-5.0,
@@ -112,6 +113,7 @@
         virtual-mysql-client-core
 Replaces: mysql-client-5.0,
           mysql-client-core-5.1,
+          mysql-client-core-5.5,
           mysql-client-5.1,
           mysql-client-5.5,
           percona-xtradb-client-5.0,
@@ -152,6 +154,7 @@
         mysql-server-5.1,
         mysql-server-5.5,
         mysql-server-core-5.1,
+        mysql-server-core-5.5,
         percona-xtradb-server-5.0,
         percona-server-server-5.1,
         mariadb-server,
@@ -163,6 +166,7 @@
           mysql-server-5.1,
           mysql-server-5.5,
           mysql-server-core-5.1,
+          mysql-server-core-5.5,
           percona-xtradb-server-5.0,
           percona-server-server-5.1,
           mariadb-server,

=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-08-26 14:03:49 +0000
+++ build-ps/debian/rules	2014-10-07 16:27:15 +0000
@@ -74,6 +74,7 @@
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 		-DCMAKE_BUILD_TYPE=Debug \
+		-DENABLE_DTRACE=OFF \
 		-DWITH_LIBWRAP=ON \
 		-DWITH_SSL=system \
 		-DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \
@@ -99,6 +100,7 @@
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DENABLE_DTRACE=OFF \
 		-DWITH_LIBWRAP=ON \
 		-DWITH_SSL=system \
 		-DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \

=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-08-29 07:43:51 +0000
+++ build-ps/percona-server.spec	2014-10-07 16:27:15 +0000
@@ -50,6 +50,14 @@
   %endif
 %endif
 
+%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
 #
@@ -242,6 +250,8 @@
 %if 0%{?systemd}
 BuildRequires:  systemd
 %endif
+Patch0:         mysql-5.5-sharedlib-rename.patch
+Patch1:         mysql-5.5-libmysqlclient-symbols.patch
 
 # Think about what you use here since the first step is to
 # run a rm -rf
@@ -319,7 +329,7 @@
 %package -n Percona-Server-client%{product_suffix}
 Summary:        Percona Server - Client
 Group:          Applications/Databases
-Requires:      Percona-Server-shared%{product_suffix}
+Requires:       Percona-Server-shared%{product_suffix}
 Provides:       mysql-client MySQL-client mysql MySQL
 Conflicts:      Percona-SQL-client-50 Percona-Server-client-51
 
@@ -360,12 +370,21 @@
 %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-56
+%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)
-%endif
+Provides:       libmysqlclient.so.18(libmysqlclient_18)(32bit)
+%endif
+%endif
+
 
 %description -n Percona-Server-shared%{product_suffix}
 This package contains the shared libraries (*.so*) which certain languages
@@ -376,6 +395,12 @@
 %prep
 #
 %setup -n %{src_dir}
+
+%if "%rhel" > "6"
+%patch0 -p1
+%patch1 -p1
+%endif
+
 #
 ##############################################################################
 %build
@@ -454,6 +479,7 @@
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
+           -DENABLE_DTRACE=OFF \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DWITH_SSL=system \
            -DINSTALL_MYSQLSHAREDIR=share/percona-server \
@@ -473,6 +499,7 @@
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DENABLE_DTRACE=OFF \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DWITH_SSL=system \
            -DINSTALL_MYSQLSHAREDIR=share/percona-server \
@@ -554,11 +581,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
+
 # Delete the symlinks to the libraries from the libdir. These are created by
 # ldconfig(8) afterwards.
 rm -f $RBR%{_libdir}/libmysqlclient*.so.18
@@ -569,7 +601,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} \
@@ -596,15 +628,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.
@@ -760,20 +783,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}
@@ -790,6 +804,11 @@
 if [ X${PERCONA_DEBUG} == X1 ]; then
         set -x
 fi
+
+%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.
@@ -848,6 +867,10 @@
     fi
 fi 
 
+%if 0%{?systemd}
+  %tmpfiles_create mysql.conf
+%endif
+
 # ----------------------------------------------------------------------
 # Make MySQL start/shutdown automatically when the machine does it.
 # ----------------------------------------------------------------------
@@ -856,7 +879,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
@@ -894,21 +917,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:"
@@ -945,12 +965,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
@@ -1007,7 +1024,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
@@ -1023,7 +1040,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
@@ -1041,6 +1058,11 @@
 echo "====="                                     >> $STATUS_HISTORY
 
 
+%postun -n Percona-Server-server%{product_suffix}
+%if 0%{?systemd}
+%systemd_postun_with_restart mysqld
+%endif
+
 # ----------------------------------------------------------------------
 # Clean up the BuildRoot after build is done
 # ----------------------------------------------------------------------
@@ -1095,11 +1117,6 @@
 %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
-%if 0%{?systemd}
-%attr(755, root, root) %{_bindir}/mysql-systemd
-%endif
-
-%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
 
 %attr(755, root, root) %{_bindir}/innochecksum
 %attr(755, root, root) %{_bindir}/myisam_ftdump
@@ -1186,7 +1203,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
@@ -1239,8 +1258,8 @@
 %{_includedir}/mysql/*
 %{_includedir}/handlersocket
 %{_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}/mysql/libhsclient.a
 %{_libdir}/libhsclient.la
@@ -1249,13 +1268,17 @@
 %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}
-# Added for compatibility
-for lib in libmysqlclient{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do
+# For compatibility after reverting name to libmysql
+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.0.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:27:15 +0000
@@ -0,0 +1,27 @@
+# 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
+
+[mysqld_safe]
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid

=== added file 'build-ps/rpm/mysql-5.5-libmysqlclient-symbols.patch'
--- build-ps/rpm/mysql-5.5-libmysqlclient-symbols.patch	1970-01-01 00:00:00 +0000
+++ build-ps/rpm/mysql-5.5-libmysqlclient-symbols.patch	2014-10-07 16:27:15 +0000
@@ -0,0 +1,981 @@
+diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
+--- old/libmysql/CMakeLists.txt	2014-09-18 10:47:31.000000000 +0200
++++ new/libmysql/CMakeLists.txt	2014-09-22 09:45:34.769758731 +0200
+@@ -219,13 +219,14 @@ IF(NOT DISABLE_SHARED)
+       OUTPUT_NAME mysqlclient 
+       VERSION "${OS_SHARED_LIB_VERSION}" 
+       SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
++    CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
+     IF(LINK_FLAG_NO_UNDEFINED)
+       GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
+       IF(NOT libmysql_link_flag)
+         SET(libmysql_link_flags)
+       ENDIF()
+     IF(INSTALL_LAYOUT STREQUAL "RPM")
+-      SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmysql.map ${LINK_FLAG_NO_UNDEFINED}")
++      SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver ${LINK_FLAG_NO_UNDEFINED}")
+     ELSE()
+       SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
+     ENDIF(INSTALL_LAYOUT STREQUAL "RPM")
+diff -rup old/libmysql/libmysql.c new/libmysql/libmysql.c
+--- old/libmysql/libmysql.c	2014-09-02 10:31:46.000000000 +0200
++++ new/libmysql/libmysql.c	2014-09-22 09:30:42.873744272 +0200
+@@ -4874,3 +4874,612 @@ my_bool STDCALL mysql_read_query_result(
+   return (*mysql->methods->read_query_result)(mysql);
+ }
+ 
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions
++
++#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16")
++
++void STDCALL symver16_myodbc_remove_escape(MYSQL *mysql,char *name)
++{
++  return myodbc_remove_escape(mysql, name);
++}
++SYM_16(myodbc_remove_escape);
++
++
++my_ulonglong STDCALL symver16_mysql_affected_rows(MYSQL *mysql)
++{
++  return mysql_affected_rows(mysql);
++}
++SYM_16(mysql_affected_rows);
++
++
++my_bool STDCALL symver16_mysql_autocommit(MYSQL * mysql, my_bool auto_mode)
++{
++  return mysql_autocommit(mysql, auto_mode);
++}
++SYM_16(mysql_autocommit);
++
++
++my_bool STDCALL symver16_mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db)
++{
++  return mysql_change_user(mysql, user, passwd, db);
++}
++SYM_16(mysql_change_user);
++
++
++const char * STDCALL symver16_mysql_character_set_name(MYSQL *mysql)
++{
++  return mysql_character_set_name(mysql);
++}
++SYM_16(mysql_character_set_name);
++
++
++my_bool STDCALL symver16_mysql_commit(MYSQL * mysql)
++{
++  return mysql_commit(mysql);
++}
++SYM_16(mysql_commit);
++
++
++void STDCALL symver16_mysql_data_seek(MYSQL_RES *result, my_ulonglong row)
++{
++  return mysql_data_seek(result, row);
++}
++SYM_16(mysql_data_seek);
++
++
++void STDCALL symver16_mysql_debug(const char *debug __attribute__((unused)))
++{
++  return mysql_debug(debug);
++}
++SYM_16(mysql_debug);
++
++
++int STDCALL symver16_mysql_dump_debug_info(MYSQL *mysql)
++{
++  return mysql_dump_debug_info(mysql);
++}
++SYM_16(mysql_dump_debug_info);
++
++
++my_bool STDCALL symver16_mysql_embedded(void)
++{
++  return mysql_embedded();
++}
++SYM_16(mysql_embedded);
++
++
++my_bool STDCALL symver16_mysql_eof(MYSQL_RES *res)
++{
++  return mysql_eof(res);
++}
++SYM_16(mysql_eof);
++
++
++ulong STDCALL symver16_mysql_escape_string(char *to,const char *from,ulong length)
++{
++  return mysql_escape_string(to, from, length);
++}
++SYM_16(mysql_escape_string);
++
++
++MYSQL_FIELD * STDCALL symver16_mysql_fetch_field(MYSQL_RES *result)
++{
++  return mysql_fetch_field(result);
++}
++SYM_16(mysql_fetch_field);
++
++
++MYSQL_FIELD * STDCALL symver16_mysql_fetch_field_direct(MYSQL_RES *res,uint fieldnr)
++{
++  return mysql_fetch_field_direct(res, fieldnr);
++}
++SYM_16(mysql_fetch_field_direct);
++
++
++MYSQL_FIELD * STDCALL symver16_mysql_fetch_fields(MYSQL_RES *res)
++{
++  return mysql_fetch_fields(res);
++}
++SYM_16(mysql_fetch_fields);
++
++
++unsigned int STDCALL symver16_mysql_field_count(MYSQL *mysql)
++{
++  return mysql_field_count(mysql);
++}
++SYM_16(mysql_field_count);
++
++
++MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_seek(MYSQL_RES *result, MYSQL_FIELD_OFFSET field_offset)
++{
++  return mysql_field_seek(result, field_offset);
++}
++SYM_16(mysql_field_seek);
++
++
++MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_tell(MYSQL_RES *res)
++{
++  return mysql_field_tell(res);
++}
++SYM_16(mysql_field_tell);
++
++
++void STDCALL symver16_mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo)
++{
++  return mysql_get_character_set_info(mysql, csinfo);
++}
++SYM_16(mysql_get_character_set_info);
++
++
++const char * STDCALL symver16_mysql_get_client_info(void)
++{
++  return mysql_get_client_info();
++}
++SYM_16(mysql_get_client_info);
++
++ulong STDCALL symver16_mysql_get_client_version(void)
++{
++  return mysql_get_client_version();
++}
++SYM_16(mysql_get_client_version);
++
++
++const char * STDCALL symver16_mysql_get_host_info(MYSQL *mysql)
++{
++  return mysql_get_host_info(mysql);
++}
++SYM_16(mysql_get_host_info);
++
++
++MYSQL_PARAMETERS *STDCALL symver16_mysql_get_parameters(void)
++{
++  return mysql_get_parameters();
++}
++SYM_16(mysql_get_parameters);
++
++
++uint STDCALL symver16_mysql_get_proto_info(MYSQL *mysql)
++{
++  return mysql_get_proto_info(mysql);
++}
++SYM_16(mysql_get_proto_info);
++
++
++const char * STDCALL symver16_mysql_get_server_info(MYSQL *mysql)
++{
++  return mysql_get_server_info(mysql);
++}
++SYM_16(mysql_get_server_info);
++
++
++ulong STDCALL symver16_mysql_hex_string(char *to, const char *from, ulong length)
++{
++  return mysql_hex_string(to, from, length);
++}
++SYM_16(mysql_hex_string);
++
++
++const char *STDCALL symver16_mysql_info(MYSQL *mysql)
++{
++  return mysql_info(mysql);
++}
++SYM_16(mysql_info);
++
++
++my_ulonglong STDCALL symver16_mysql_insert_id(MYSQL *mysql)
++{
++  return mysql_insert_id(mysql);
++}
++SYM_16(mysql_insert_id);
++
++
++int STDCALL symver16_mysql_kill(MYSQL *mysql,ulong pid)
++{
++  return mysql_kill(mysql, pid);
++}
++SYM_16(mysql_kill);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_dbs(MYSQL *mysql, const char *wild)
++{
++  return mysql_list_dbs(mysql, wild);
++}
++SYM_16(mysql_list_dbs);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_fields(MYSQL *mysql, const char *table, const char *wild)
++{
++  return mysql_list_fields(mysql, table, wild);
++}
++SYM_16(mysql_list_fields);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_processes(MYSQL *mysql)
++{
++  return mysql_list_processes(mysql);
++}
++SYM_16(mysql_list_processes);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_tables(MYSQL *mysql, const char *wild)
++{
++  return mysql_list_tables(mysql, wild);
++}
++SYM_16(mysql_list_tables);
++
++
++my_bool STDCALL symver16_mysql_more_results(MYSQL *mysql)
++{
++  return mysql_more_results(mysql);
++}
++SYM_16(mysql_more_results);
++
++
++int STDCALL symver16_mysql_next_result(MYSQL *mysql)
++{
++  return mysql_next_result(mysql);
++}
++SYM_16(mysql_next_result);
++
++
++int STDCALL symver16_mysql_ping(MYSQL *mysql)
++{
++  return mysql_ping(mysql);
++}
++SYM_16(mysql_ping);
++
++
++int STDCALL symver16_mysql_query(MYSQL *mysql, const char *query)
++{
++  return mysql_query(mysql, query);
++}
++SYM_16(mysql_query);
++
++
++my_bool STDCALL symver16_mysql_read_query_result(MYSQL *mysql)
++{
++  return mysql_read_query_result(mysql);
++}
++SYM_16(mysql_read_query_result);
++
++
++ulong STDCALL symver16_mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, ulong length)
++{
++  return mysql_real_escape_string(mysql, to, from, length);
++}
++SYM_16(mysql_real_escape_string);
++
++
++int STDCALL symver16_mysql_refresh(MYSQL *mysql,uint options)
++{
++  return mysql_refresh(mysql, options);
++}
++SYM_16(mysql_refresh);
++
++
++my_bool STDCALL symver16_mysql_rollback(MYSQL * mysql)
++{
++  return mysql_rollback(mysql);
++}
++SYM_16(mysql_rollback);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_seek(MYSQL_RES *result, MYSQL_ROW_OFFSET row)
++{
++  return mysql_row_seek(result, row);
++}
++SYM_16(mysql_row_seek);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_tell(MYSQL_RES *res)
++{
++  return mysql_row_tell(res);
++}
++SYM_16(mysql_row_tell);
++
++
++void STDCALL symver16_mysql_server_end()
++{
++  return mysql_server_end();
++}
++SYM_16(mysql_server_end);
++
++
++int STDCALL symver16_mysql_server_init(int argc __attribute__((unused)), char **argv __attribute__((unused)), char **groups __attribute__((unused)))
++{
++  return mysql_server_init(argc, argv, groups);
++}
++SYM_16(mysql_server_init);
++
++
++void symver16_mysql_set_local_infile_default(MYSQL *mysql)
++{
++  return mysql_set_local_infile_default(mysql);
++}
++SYM_16(mysql_set_local_infile_default);
++
++
++void symver16_mysql_set_local_infile_handler(MYSQL *mysql, int (*local_infile_init)(void **, const char *, void *), int (*local_infile_read)(void *, char *, uint), void (*local_infile_end)(void *), int (*local_infile_error)(void *, char *, uint), void *userdata)
++{
++  return mysql_set_local_infile_handler(mysql, local_infile_init, local_infile_read, local_infile_end, local_infile_error, userdata);
++}
++SYM_16(mysql_set_local_infile_handler);
++
++
++int STDCALL symver16_mysql_set_server_option(MYSQL *mysql, enum enum_mysql_set_option option)
++{
++  return mysql_set_server_option(mysql, option);
++}
++SYM_16(mysql_set_server_option);
++
++
++int STDCALL symver16_mysql_shutdown(MYSQL *mysql, enum mysql_enum_shutdown_level shutdown_level)
++{
++  return mysql_shutdown(mysql, shutdown_level);
++}
++SYM_16(mysql_shutdown);
++
++
++const char *STDCALL symver16_mysql_sqlstate(MYSQL *mysql)
++{
++  return mysql_sqlstate(mysql);
++}
++SYM_16(mysql_sqlstate);
++
++
++const char * STDCALL symver16_mysql_stat(MYSQL *mysql)
++{
++  return mysql_stat(mysql);
++}
++SYM_16(mysql_stat);
++
++
++my_ulonglong STDCALL symver16_mysql_stmt_affected_rows(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_affected_rows(stmt);
++}
++SYM_16(mysql_stmt_affected_rows);
++
++
++my_bool STDCALL symver16_mysql_stmt_attr_get(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, void *value)
++{
++  return mysql_stmt_attr_get(stmt, attr_type, value);
++}
++SYM_16(mysql_stmt_attr_get);
++
++
++my_bool STDCALL symver16_mysql_stmt_attr_set(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, const void *value)
++{
++  return mysql_stmt_attr_set(stmt, attr_type, value);
++}
++SYM_16(mysql_stmt_attr_set);
++
++
++my_bool STDCALL symver16_mysql_stmt_bind_param(MYSQL_STMT *stmt, MYSQL_BIND *my_bind)
++{
++  return mysql_stmt_bind_param(stmt, my_bind);
++}
++SYM_16(mysql_stmt_bind_param);
++
++
++my_bool STDCALL symver16_mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *my_bind)
++{
++  return mysql_stmt_bind_result(stmt, my_bind);
++}
++SYM_16(mysql_stmt_bind_result);
++
++
++my_bool STDCALL symver16_mysql_stmt_close(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_close(stmt);
++}
++SYM_16(mysql_stmt_close);
++
++
++void STDCALL symver16_mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row)
++{
++  return mysql_stmt_data_seek(stmt, row);
++}
++SYM_16(mysql_stmt_data_seek);
++
++
++uint STDCALL symver16_mysql_stmt_errno(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_errno(stmt);
++}
++SYM_16(mysql_stmt_errno);
++
++
++const char *STDCALL symver16_mysql_stmt_error(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_error(stmt);
++}
++SYM_16(mysql_stmt_error);
++
++
++int STDCALL symver16_mysql_stmt_execute(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_execute(stmt);
++}
++SYM_16(mysql_stmt_execute);
++
++
++int STDCALL symver16_mysql_stmt_fetch(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_fetch(stmt);
++}
++SYM_16(mysql_stmt_fetch);
++
++
++int STDCALL symver16_mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind, uint column, ulong offset)  
++{
++  return mysql_stmt_fetch_column(stmt, my_bind, column, offset);
++}
++SYM_16(mysql_stmt_fetch_column);
++
++
++unsigned int STDCALL symver16_mysql_stmt_field_count(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_field_count(stmt);
++}
++SYM_16(mysql_stmt_field_count);
++
++
++my_bool STDCALL symver16_mysql_stmt_free_result(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_free_result(stmt);
++}
++SYM_16(mysql_stmt_free_result);
++
++
++MYSQL_STMT * STDCALL symver16_mysql_stmt_init(MYSQL *mysql)
++{
++  return mysql_stmt_init(mysql);
++}
++SYM_16(mysql_stmt_init);
++
++
++my_ulonglong STDCALL symver16_mysql_stmt_insert_id(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_insert_id(stmt);
++}
++SYM_16(mysql_stmt_insert_id);
++
++
++my_ulonglong STDCALL symver16_mysql_stmt_num_rows(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_num_rows(stmt);
++}
++SYM_16(mysql_stmt_num_rows);
++
++
++ulong STDCALL symver16_mysql_stmt_param_count(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_param_count(stmt);
++}
++SYM_16(mysql_stmt_param_count);
++
++
++MYSQL_RES * STDCALL symver16_mysql_stmt_param_metadata(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_param_metadata(stmt);
++}
++SYM_16(mysql_stmt_param_metadata);
++
++
++int STDCALL symver16_mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, ulong length)
++{
++  return mysql_stmt_prepare(stmt, query, length);
++}
++SYM_16(mysql_stmt_prepare);
++
++
++my_bool STDCALL symver16_mysql_stmt_reset(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_reset(stmt);
++}
++SYM_16(mysql_stmt_reset);
++
++
++MYSQL_RES * STDCALL symver16_mysql_stmt_result_metadata(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_result_metadata(stmt);
++}
++SYM_16(mysql_stmt_result_metadata);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_seek(MYSQL_STMT *stmt, MYSQL_ROW_OFFSET row)
++{
++  return mysql_stmt_row_seek(stmt, row);
++}
++SYM_16(mysql_stmt_row_seek);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_tell(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_row_tell(stmt);
++}
++SYM_16(mysql_stmt_row_tell);
++
++
++my_bool STDCALL symver16_mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number, const char *data, ulong length)
++{
++  return mysql_stmt_send_long_data(stmt, param_number, data, length);
++}
++SYM_16(mysql_stmt_send_long_data);
++
++
++const char *STDCALL symver16_mysql_stmt_sqlstate(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_sqlstate(stmt);
++}
++SYM_16(mysql_stmt_sqlstate);
++
++
++int STDCALL symver16_mysql_stmt_store_result(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_store_result(stmt);
++}
++SYM_16(mysql_stmt_store_result);
++
++
++void STDCALL symver16_mysql_thread_end()
++{
++  return mysql_thread_end();
++}
++SYM_16(mysql_thread_end);
++
++
++ulong STDCALL symver16_mysql_thread_id(MYSQL *mysql)
++{
++  return mysql_thread_id(mysql);
++}
++SYM_16(mysql_thread_id);
++
++
++my_bool STDCALL symver16_mysql_thread_init()
++{
++  return mysql_thread_init();
++}
++SYM_16(mysql_thread_init);
++
++
++uint STDCALL symver16_mysql_thread_safe(void)
++{
++  return mysql_thread_safe();
++}
++SYM_16(mysql_thread_safe);
++
++
++MYSQL_RES * STDCALL symver16_mysql_use_result(MYSQL *mysql)
++{
++  return mysql_use_result(mysql);
++}
++SYM_16(mysql_use_result);
++
++
++uint STDCALL symver16_mysql_warning_count(MYSQL *mysql)
++{
++  return mysql_warning_count(mysql);
++}
++SYM_16(mysql_warning_count);
++
++/*****/
++
++MYSQL * STDCALL symver16_mysql_real_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, uint port, const char *unix_socket,ulong client_flag)
++{
++  return mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket, client_flag);
++}
++SYM_16(mysql_real_connect);
++
++/*****/
++
++my_bool symver16_my_init(void)
++{
++  return my_init();
++}
++SYM_16(my_init);
++
++#endif
+diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in
+--- old/libmysql/libmysql.ver.in	2014-09-18 10:49:37.000000000 +0200
++++ new/libmysql/libmysql.ver.in	2014-09-22 09:31:37.309745154 +0200
+@@ -1 +1,136 @@
+-libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
++libmysqlclient_16
++{
++  local:
++    symver16_*;
++};
++
++libmysqlclient_18
++{
++  global:
++    my_init;
++    myodbc_remove_escape;
++    mysql_affected_rows;
++    mysql_autocommit;
++    mysql_change_user;
++    mysql_character_set_name;
++    mysql_close;
++    mysql_commit;
++    mysql_data_seek;
++    mysql_debug;
++    mysql_dump_debug_info;
++    mysql_embedded;
++    mysql_eof;
++    mysql_errno;
++    mysql_error;
++    mysql_escape_string;
++    mysql_fetch_field;
++    mysql_fetch_field_direct;
++    mysql_fetch_fields;
++    mysql_fetch_lengths;
++    mysql_fetch_row;
++    mysql_field_count;
++    mysql_field_seek;
++    mysql_field_tell;
++    mysql_free_result;
++    mysql_get_character_set_info;
++    mysql_get_client_info;
++    mysql_get_client_version;
++    mysql_get_host_info;
++    mysql_get_parameters;
++    mysql_get_proto_info;
++    mysql_get_server_info;
++    mysql_get_server_version;
++    mysql_get_ssl_cipher;
++    mysql_hex_string;
++    mysql_info;
++    mysql_init;
++    mysql_insert_id;
++    mysql_kill;
++    mysql_list_dbs;
++    mysql_list_fields;
++    mysql_list_processes;
++    mysql_list_tables;
++    mysql_more_results;
++    mysql_next_result;
++    mysql_num_fields;
++    mysql_num_rows;
++    mysql_options;
++    mysql_ping;
++    mysql_query;
++    mysql_read_query_result;
++    mysql_real_connect;
++    mysql_real_escape_string;
++    mysql_real_query;
++    mysql_refresh;
++    mysql_rollback;
++    mysql_row_seek;
++    mysql_row_tell;
++    mysql_select_db;
++    mysql_send_query;
++    mysql_server_end;
++    mysql_server_init;
++    mysql_set_character_set;
++    mysql_set_local_infile_default;
++    mysql_set_local_infile_handler;
++    mysql_set_server_option;
++    mysql_shutdown;
++    mysql_sqlstate;
++    mysql_ssl_set;
++    mysql_stat;
++    mysql_stmt_affected_rows;
++    mysql_stmt_attr_get;
++    mysql_stmt_attr_set;
++    mysql_stmt_bind_param;
++    mysql_stmt_bind_result;
++    mysql_stmt_close;
++    mysql_stmt_data_seek;
++    mysql_stmt_errno;
++    mysql_stmt_error;
++    mysql_stmt_execute;
++    mysql_stmt_fetch;
++    mysql_stmt_fetch_column;
++    mysql_stmt_field_count;
++    mysql_stmt_free_result;
++    mysql_stmt_init;
++    mysql_stmt_insert_id;
++    mysql_stmt_num_rows;
++    mysql_stmt_param_count;
++    mysql_stmt_param_metadata;
++    mysql_stmt_prepare;
++    mysql_stmt_reset;
++    mysql_stmt_result_metadata;
++    mysql_stmt_row_seek;
++    mysql_stmt_row_tell;
++    mysql_stmt_send_long_data;
++    mysql_stmt_sqlstate;
++    mysql_stmt_store_result;
++    mysql_store_result;
++    mysql_thread_end;
++    mysql_thread_id;
++    mysql_thread_init;
++    mysql_thread_safe;
++    mysql_use_result;
++    mysql_warning_count;
++
++    free_defaults;
++    handle_options;
++    load_defaults;
++    my_print_help;
++
++    #my_make_scrambled_password;
++    THR_KEY_mysys;
++
++    mysql_client_find_plugin;
++    mysql_client_register_plugin;
++    mysql_load_plugin;
++    mysql_load_plugin_v;
++    mysql_plugin_options;
++    mysql_stmt_next_result;
++
++    #mysql_default_charset_info;
++    mysql_get_charset;
++    mysql_get_charset_by_csname;
++    mysql_net_realloc;
++    #mysql_client_errors;
++    *;
++} libmysqlclient_16;
+diff -rup old/mysys/charset.c new/mysys/charset.c
+--- old/mysys/charset.c	2014-09-02 10:31:46.000000000 +0200
++++ new/mysys/charset.c	2014-09-22 09:32:24.853745925 +0200
+@@ -941,3 +941,20 @@ size_t escape_quotes_for_mysql(CHARSET_I
+   *to= 0;
+   return overflow ? (ulong)~0 : (ulong) (to - to_start);
+ }
++
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide Fedora symbols
++
++CHARSET_INFO *mysql_get_charset(uint cs_number, myf flags)
++{
++  return get_charset(cs_number, flags);
++}
++
++
++CHARSET_INFO * mysql_get_charset_by_csname(const char *cs_name, uint cs_flags, myf flags)
++{
++  return get_charset_by_csname(cs_name, cs_flags, flags);
++}
++
++#endif
+diff -rup old/sql/net_serv.cc new/sql/net_serv.cc
+--- old/sql/net_serv.cc	2014-09-02 10:31:46.000000000 +0200
++++ new/sql/net_serv.cc	2014-09-22 09:33:14.009746722 +0200
+@@ -1199,3 +1199,16 @@ void my_net_set_write_timeout(NET *net,
+ #endif
+   DBUG_VOID_RETURN;
+ }
++
++#ifndef EMBEDDED_LIBRARY
++C_MODE_START
++
++// Hack to provide Fedora symbols
++
++my_bool mysql_net_realloc(NET *net, size_t length)
++{
++  return net_realloc(net, length);
++}
++
++C_MODE_END
++#endif
+diff -rup old/sql/password.c new/sql/password.c
+--- old/sql/password.c	2014-09-02 10:31:46.000000000 +0200
++++ new/sql/password.c	2014-09-22 09:33:57.913747434 +0200
+@@ -563,3 +563,17 @@ void make_password_from_salt(char *to, c
+   *to++= PVERSION41_CHAR;
+   octet2hex(to, (const char*) hash_stage2, SHA1_HASH_SIZE);
+ }
++
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions
++
++#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16")
++
++void symver16_my_make_scrambled_password(char *to, const char *password, size_t pass_len)
++{
++  my_make_scrambled_password(to, password, pass_len);
++}
++SYM_16(my_make_scrambled_password);
++
++#endif
+diff -rup old/sql-common/client.c new/sql-common/client.c
+--- old/sql-common/client.c	2014-09-02 10:31:44.000000000 +0200
++++ new/sql-common/client.c	2014-09-22 09:34:52.453748318 +0200
+@@ -4415,3 +4415,136 @@ static int clear_password_auth_client(MY
+ 
+   return res ? CR_ERROR : CR_OK;
+ }
++
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions
++
++#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16")
++
++void STDCALL symver16_mysql_close(MYSQL *mysql)
++{
++  return mysql_close(mysql);
++}
++SYM_16(mysql_close);
++
++
++uint STDCALL symver16_mysql_errno(MYSQL *mysql)
++{
++  return mysql_errno(mysql);
++}
++SYM_16(mysql_errno);
++
++
++const char * STDCALL symver16_mysql_error(MYSQL *mysql)
++{
++  return mysql_error(mysql);
++}
++SYM_16(mysql_error);
++
++
++ulong * STDCALL symver16_mysql_fetch_lengths(MYSQL_RES *res)
++{
++  return mysql_fetch_lengths(res);
++}
++SYM_16(mysql_fetch_lengths);
++
++
++MYSQL_ROW STDCALL symver16_mysql_fetch_row(MYSQL_RES *res)
++{
++  return mysql_fetch_row(res);
++}
++SYM_16(mysql_fetch_row);
++
++
++void STDCALL symver16_mysql_free_result(MYSQL_RES *result)
++{
++  return mysql_free_result(result);
++}
++SYM_16(mysql_free_result);
++
++
++ulong STDCALL symver16_mysql_get_server_version(MYSQL *mysql)
++{
++  return mysql_get_server_version(mysql);
++}
++SYM_16(mysql_get_server_version);
++
++
++const char * STDCALL symver16_mysql_get_ssl_cipher(MYSQL *mysql __attribute__((unused)))
++{
++  return mysql_get_ssl_cipher(mysql);
++}
++SYM_16(mysql_get_ssl_cipher);
++
++
++MYSQL * STDCALL symver16_mysql_init(MYSQL *mysql)
++{
++  return mysql_init(mysql);
++}
++SYM_16(mysql_init);
++
++
++unsigned int STDCALL symver16_mysql_num_fields(MYSQL_RES *res)
++{
++  return mysql_num_fields(res);
++}
++SYM_16(mysql_num_fields);
++
++
++my_ulonglong STDCALL symver16_mysql_num_rows(MYSQL_RES *res)
++{
++  return mysql_num_rows(res);
++}
++SYM_16(mysql_num_rows);
++
++
++int STDCALL symver16_mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
++{
++  return mysql_options(mysql, option, arg);
++}
++SYM_16(mysql_options);
++
++
++int STDCALL symver16_mysql_real_query(MYSQL *mysql, const char *query, ulong length)
++{
++  return mysql_real_query(mysql, query, length);
++}
++SYM_16(mysql_real_query);
++
++
++int STDCALL symver16_mysql_select_db(MYSQL *mysql, const char *db)
++{
++  return mysql_select_db(mysql, db);
++}
++SYM_16(mysql_select_db);
++
++
++int STDCALL symver16_mysql_send_query(MYSQL* mysql, const char* query, ulong length)
++{
++  return mysql_send_query(mysql, query, length);
++}
++SYM_16(mysql_send_query);
++
++
++int STDCALL symver16_mysql_set_character_set(MYSQL *mysql, const char *cs_name)
++{
++  return mysql_set_character_set(mysql, cs_name);
++}
++SYM_16(mysql_set_character_set);
++
++
++my_bool STDCALL symver16_mysql_ssl_set(MYSQL *mysql __attribute__((unused)), const char *key __attribute__((unused)), const char *cert __attribute__((unused)), const char *ca __attribute__((unused)), const char *capath __attribute__((unused)), const char *cipher __attribute__((unused)))
++{
++  return mysql_ssl_set(mysql, key, cert, ca, capath, cipher);
++}
++SYM_16(mysql_ssl_set);
++
++
++MYSQL_RES * STDCALL symver16_mysql_store_result(MYSQL *mysql)
++{
++  return mysql_store_result(mysql);
++}
++SYM_16(mysql_store_result);
++
++#endif

=== added file 'build-ps/rpm/mysql-5.5-sharedlib-rename.patch'
--- build-ps/rpm/mysql-5.5-sharedlib-rename.patch	1970-01-01 00:00:00 +0000
+++ build-ps/rpm/mysql-5.5-sharedlib-rename.patch	2014-10-07 16:27:15 +0000
@@ -0,0 +1,429 @@
+diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt
+--- old/client/CMakeLists.txt	2014-09-02 10:31:44.520385517 +0200
++++ new/client/CMakeLists.txt	2014-09-18 10:53:56.746861840 +0200
+@@ -28,45 +28,45 @@ INCLUDE_DIRECTORIES(
+ ADD_DEFINITIONS(${READLINE_DEFINES})
+ 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 ${READLINE_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)
+ 
+ # "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-02 10:31:46.484385549 +0200
++++ new/libmysql/CMakeLists.txt	2014-09-18 10:47:31.254855590 +0200
+@@ -163,13 +163,13 @@ IF(WIN32)
+   LIST(APPEND LIBS auth_win_client)
+ ENDIF()
+ 
+-# 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(perconaserverclient STATIC ${LIBS} COMPONENT Development)
++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()
+ 
+@@ -194,9 +194,9 @@ 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()
+ 
+@@ -214,9 +214,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}")
+     IF(LINK_FLAG_NO_UNDEFINED)
+@@ -231,13 +231,13 @@ IF(NOT DISABLE_SHARED)
+     ENDIF(INSTALL_LAYOUT STREQUAL "RPM")
+     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)
+@@ -251,7 +251,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-02 10:31:46.484385549 +0200
++++ new/libmysql/libmysql.map	2014-09-18 10:49:01.386857051 +0200
+@@ -1,5 +1,5 @@
+ # symbols exported from mysql 5.1
+-libperconaserverclient_16 {
++libmysqlclient_16 {
+   global:
+ 	_fini;
+ 	_init;
+@@ -121,7 +121,7 @@ libperconaserverclient_16 {
+ 	*;
+ };
+ # symbols added in mysql 5.5
+-libperconaserverclient_18 {
++libmysqlclient_18 {
+   global:
+ 	mysql_client_find_plugin;
+ 	mysql_client_register_plugin;
+@@ -133,7 +133,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;
+diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in
+--- old/libmysql/libmysql.ver.in	2014-09-02 10:31:46.488385549 +0200
++++ new/libmysql/libmysql.ver.in	2014-09-18 10:49:37.018857629 +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-02 10:31:46.548385550 +0200
++++ new/plugin/percona-pam-for-mysql/CMakeLists.txt	2014-09-18 11:12:44.546880123 +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-02 10:31:45.744385537 +0200
++++ new/scripts/CMakeLists.txt	2014-09-18 10:57:36.062865395 +0200
+@@ -242,7 +242,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 "")
+ 
+@@ -282,7 +282,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-02 10:31:45.744385537 +0200
++++ new/scripts/mysql_config.pl.in	2014-09-18 10:56:49.110864634 +0200
+@@ -183,15 +183,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-02 10:31:45.748385537 +0200
++++ new/scripts/mysql_config.sh	2014-09-18 10:58:25.702866200 +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@ "
+ 
+ if [ -r "$pkglibdir/libmygcc.a" ]; then
+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-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2014-09-18 11:01:36.374869291 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(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-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2014-09-18 11:02:59.302870635 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(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-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2014-09-18 11:04:24.226872012 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -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-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2014-09-18 11:04:42.406872307 +0200
+@@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(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_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2014-09-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2014-09-18 11:03:23.782871032 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(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_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
+--- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2014-09-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2014-09-18 11:02:29.830870158 +0200
+@@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(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-02 10:31:46.424385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2014-09-18 11:00:36.934868327 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+ 
+ $(TARGET).o: $(SRCS)
+ 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -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-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2014-09-18 11:01:09.606868857 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(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-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2014-09-18 11:02:01.074869691 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(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-02 10:31:46.428385548 +0200
++++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2014-09-18 11:04:00.262871624 +0200
+@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
+ SYS_LIB = 
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
++	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(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/ndbapi/Makefile.am new/storage/ndb/test/ndbapi/Makefile.am
+--- old/storage/ndb/test/ndbapi/Makefile.am	2014-09-02 10:31:46.272385546 +0200
++++ new/storage/ndb/test/ndbapi/Makefile.am	2014-09-18 10:59:49.286867555 +0200
+@@ -102,7 +102,7 @@ testReadPerf_SOURCES = testReadPerf.cpp
+ testLcp_SOURCES = testLcp.cpp
+ testPartitioning_SOURCES = testPartitioning.cpp
+ testNDBT_SOURCES = testNDBT.cpp
+-testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libperconaserverclient_r.la
++testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libmysqlclient_r.la
+ testBitfield_SOURCES = testBitfield.cpp
+ NdbRepStress_SOURCES = acrt/NdbRepStress.cpp
+ DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
+@@ -124,7 +124,7 @@ include $(top_srcdir)/storage/ndb/config
+ NdbRepStress_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/test/include -I$(top_srcdir)/include
+ testBackup_LDADD = $(LDADD) bank/libbank.a
+ testSRBank_LDADD = bank/libbank.a $(LDADD) 
+-NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libperconaserverclient_r.la
++NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la
+ 
+ windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
+              testScan.dsp
+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-02 10:31:46.520385550 +0200
++++ new/support-files/MySQL-shared-compat.spec.sh	2014-09-18 11:11:58.210879372 +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-02 10:31:46.520385550 +0200
++++ new/support-files/mysql.spec.sh	2014-09-18 11:11:29.494878906 +0200
+@@ -704,7 +704,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
+@@ -1177,8 +1177,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-02 10:31:46.512385550 +0200
++++ new/tests/CMakeLists.txt	2014-09-18 11:06:20.830873902 +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:27:15 +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-08-29 07:43:51 +0000
+++ storage/innobase/include/univ.i	2014-10-07 16:27:15 +0000
@@ -64,7 +64,7 @@
 	(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 36.0
+#define PERCONA_INNODB_VERSION 36.1
 #endif
 
 #define INNODB_VERSION_STR	MYSQL_SERVER_VERSION