Merge lp:~stewart/percona-server/5.5-psclient into lp:percona-server/5.5

[Stewart Smith]

This changes our client library in Percona Server to be built as libperconaserverclient rather than libmysqlclient. This avoids a whole bunch of problems both in binary compatibility and conflicting packages.

If we are to be included in Linux distributions as an alternative MySQL, this is one thing we need to do - play nice with others.

I've updated build files and packaging for the difference.

I'm currently wanting review on this especially for compatibility with our existing packages and if there's any problems with this approach that we can reasonably fix.

All of this is included in https://code.launchpad.net/~stewart/percona-server/pkg-5.5/+merge/199742 but it may be easier to review as a separate MP for this part alone.

[Laurynas Biveinis (laurynas-biveinis)]

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

    - Some remaining references to mysqlclient:
      - upgrading_guide.rst
      - not sure if actually relevant: .bzrignore entry
        libmysql/merge_archives_mysqlclient.cmake
      - plugin/management/pam_plugin.rst

review: Needs Fixing

=== modified file 'Percona-Server/.bzrignore'
--- Percona-Server/.bzrignore	2013-01-15 08:56:36 +0000
+++ Percona-Server/.bzrignore	2013-12-23 00:18:44 +0000
@@ -782,9 +782,9 @@
 libmysql/.deps/viossl.Plo
 libmysql/.deps/viosslfactories.Plo
 libmysql/.deps/xml.Plo
-libmysql/.libs/libmysqlclient.lai
-libmysql/.libs/libmysqlclient.so.15
-libmysql/.libs/libmysqlclient.so.15.0.0
+libmysql/.libs/libperconaserverclient.lai
+libmysql/.libs/libperconaserverclient.so.15
+libmysql/.libs/libperconaserverclient.so.15.0.0
 libmysql/conf_to_src
 libmysql/debug/libmysql.exp
 libmysql/libmysql.ver
@@ -918,9 +918,9 @@
 libmysql_r/.deps/viossl.Plo
 libmysql_r/.deps/viosslfactories.Plo
 libmysql_r/.deps/xml.Plo
-libmysql_r/.libs/libmysqlclient_r.lai
-libmysql_r/.libs/libmysqlclient_r.so.15
-libmysql_r/.libs/libmysqlclient_r.so.15.0.0
+libmysql_r/.libs/libperconaserverclient_r.lai
+libmysql_r/.libs/libperconaserverclient_r.so.15
+libmysql_r/.libs/libperconaserverclient_r.so.15.0.0
 libmysql_r/acconfig.h
 libmysql_r/client_settings.h
 libmysql_r/conf_to_src

=== modified file 'Percona-Server/client/CMakeLists.txt'
--- Percona-Server/client/CMakeLists.txt	2012-10-10 20:32:32 +0000
+++ Percona-Server/client/CMakeLists.txt	2013-12-23 00:18:44 +0000
@@ -28,44 +28,44 @@
 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 mysqlclient)
+TARGET_LINK_LIBRARIES(mysql perconaserverclient)
 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 mysqlclient regex)
+TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
 
 
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
+TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
-TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
+TARGET_LINK_LIBRARIES(mysqldump perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
-TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
-TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
+TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
-TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
-TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc)
-TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
+TARGET_LINK_LIBRARIES(mysqladmin perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
-TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient)
 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)

=== modified file 'Percona-Server/libmysql/CMakeLists.txt'
--- Percona-Server/libmysql/CMakeLists.txt	2013-12-05 08:07:26 +0000
+++ Percona-Server/libmysql/CMakeLists.txt	2013-12-23 00:18:44 +0000
@@ -163,15 +163,19 @@
   LIST(APPEND LIBS auth_win_client)
 ENDIF()
 
-# Merge several convenience libraries into one big mysqlclient
+# Merge several convenience libraries into one big perconaserverclient
 # and link them together into shared library.
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
 
 # Visual Studio users need debug  static library for debug projects
 INSTALL_DEBUG_SYMBOLS(clientlib)
 IF(MSVC)
+<<<<<<< TREE
  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
+=======
+ INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug)
+>>>>>>> MERGE-SOURCE
 ENDIF()
 
 IF(UNIX)
@@ -186,7 +190,7 @@
       SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
     ENDIF() 
   ENDMACRO()
-  INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
+  INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a perconaserverclient ${INSTALL_LIBDIR} Development)
 ENDIF()
 
 IF(NOT DISABLE_SHARED)
@@ -200,9 +204,9 @@
     ELSE()
       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
     ENDIF()
-    # Name of shared library is mysqlclient on Unix
+    # Name of shared library is perconaserverclient on Unix
     SET_TARGET_PROPERTIES(libmysql PROPERTIES 
-      OUTPUT_NAME mysqlclient 
+      OUTPUT_NAME perconaserverclient 
       VERSION "${OS_SHARED_LIB_VERSION}" 
       SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
     IF(LINK_FLAG_NO_UNDEFINED)
@@ -217,13 +221,13 @@
     ENDIF(INSTALL_LAYOUT STREQUAL "RPM")
     ENDIF() 
     # clean direct output needs to be set several targets have the same name
-    #(mysqlclient in this case)
-    SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+    #(perconaserverclient in this case)
+    SET_TARGET_PROPERTIES(perconaserverclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
     SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
-    # Install links to libmysqlclient.so (client_r)
+    # Install links to libperconaserverclient.so (client_r)
     GET_VERSIONED_LIBNAME(
-      "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
+      "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r"
       "${CMAKE_SHARED_LIBRARY_SUFFIX}"
       ""
       linkname)
@@ -232,7 +236,7 @@
     LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
     FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
       GET_VERSIONED_LIBNAME(
-        "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
+        "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r"
         "${CMAKE_SHARED_LIBRARY_SUFFIX}"
         "${ver}"
         linkname)

=== modified file 'Percona-Server/libmysql/libmysql.map'
--- Percona-Server/libmysql/libmysql.map	2013-02-04 17:07:22 +0000
+++ Percona-Server/libmysql/libmysql.map	2013-12-23 00:18:44 +0000
@@ -1,5 +1,5 @@
 # symbols exported from mysql 5.1
-libmysqlclient_16 {
+libperconaserverclient_16 {
   global:
 	_fini;
 	_init;
@@ -121,7 +121,7 @@
 	*;
 };
 # symbols added in mysql 5.5
-libmysqlclient_18 {
+libperconaserverclient_18 {
   global:
 	mysql_client_find_plugin;
 	mysql_client_register_plugin;
@@ -133,7 +133,7 @@
 # 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 libmysqlclient_16.
+# in libperconaserverclient_16.
 #
 # mysql-connector-odbc requires these
 	mysql_default_charset_info;

=== modified file 'Percona-Server/libmysql/libmysql.ver.in'
--- Percona-Server/libmysql/libmysql.ver.in	2006-01-17 14:51:08 +0000
+++ Percona-Server/libmysql/libmysql.ver.in	2013-12-23 00:18:44 +0000
@@ -1,1 +1,1 @@
-libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
+libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };

=== modified file 'Percona-Server/man/mysql_config.1'
--- Percona-Server/man/mysql_config.1	2013-12-05 08:07:26 +0000
+++ Percona-Server/man/mysql_config.1	2013-12-23 00:18:44 +0000
@@ -54,7 +54,7 @@
 \fB\-\-cflags\fR
 .sp
 Compiler flags to find include files and critical compiler flags and defines used when compiling the
-libmysqlclient
+libperconaserverclient
 library\&. The options returned are tied to the specific compiler that was used when the library was created and might clash with the settings for your own compiler\&. Use
 \fB\-\-include\fR
 for more portable options that contain only include paths\&.
@@ -198,10 +198,17 @@
 Options:
   \-\-cflags         [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
   \-\-include        [\-I/usr/local/mysql/include/mysql]
+<<<<<<< TREE
   \-\-libs           [\-L/usr/local/mysql/lib/mysql \-lmysqlclient
                     \-lpthread \-lm \-lrt \-lssl \-lcrypto \-ldl]
   \-\-libs_r         [\-L/usr/local/mysql/lib/mysql \-lmysqlclient_r
                     \-lpthread \-lm \-lrt \-lssl \-lcrypto \-ldl]
+=======
+  \-\-libs           [\-L/usr/local/mysql/lib/mysql \-lperconaserverclient \-lz
+                    \-lcrypt \-lnsl \-lm \-L/usr/lib \-lssl \-lcrypto]
+  \-\-libs_r         [\-L/usr/local/mysql/lib/mysql \-lperconaserverclient_r
+                    \-lpthread \-lz \-lcrypt \-lnsl \-lm \-lpthread]
+>>>>>>> MERGE-SOURCE
   \-\-socket         [/tmp/mysql\&.sock]
   \-\-port           [3306]
   \-\-version        [5\&.5\&.31]

=== modified file 'Percona-Server/packaging/rpm-uln/mysql.spec.sh'
--- Percona-Server/packaging/rpm-uln/mysql.spec.sh	2013-11-05 07:03:43 +0000
+++ Percona-Server/packaging/rpm-uln/mysql.spec.sh	2013-12-23 00:18:44 +0000
@@ -520,7 +520,7 @@
 cd release
 mkdir libmysqld/work
 cd libmysqld/work
-# "libmysqld" provides the same ABI as "libmysqlclient", but it implements the server:
+# "libmysqld" provides the same ABI as "libperconaserverclient", but it implements the server:
 # The shared object is identified by the full version,
 # for linkage selection the first two levels are sufficient so that upgrades are possible
 # (see "man ld", option "-soname").
@@ -644,7 +644,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_src_distribution
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1*
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libperconaserverclient*.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
@@ -737,7 +737,7 @@
   rpm -qa | grep -i '^mysql-'
 
   You may choose to use 'rpm --nodeps -ev <package-name>' to remove
-  the package which contains the mysqlclient shared library.  The
+  the package which contains the perconaserverclient 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
@@ -826,7 +826,7 @@
 # libs package because it can be used for client settings too.
 %config(noreplace) /etc/my.cnf
 %dir %{_libdir}/mysql
-%{_libdir}/mysql/libmysqlclient*.so.*
+%{_libdir}/mysql/libperconaserverclient*.so.*
 /etc/ld.so.conf.d/*
 
 %dir %{_datadir}/mysql
@@ -959,7 +959,7 @@
 %defattr(-,root,root)
 /usr/include/mysql
 /usr/share/aclocal/mysql.m4
-%{_libdir}/mysql/libmysqlclient*.so
+%{_libdir}/mysql/libperconaserverclient*.so
 
 %files -n mysql-embedded%{product_suffix}
 %defattr(-,root,root)

=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt'
--- Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt	2013-08-21 07:39:21 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt	2013-12-23 00:18:44 +0000
@@ -31,6 +31,6 @@
   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 mysqlclient MODULE_ONLY)
+  MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES perconaserverclient MODULE_ONLY)
 ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
 ENDIF(WITH_PAM)

=== modified file 'Percona-Server/scripts/CMakeLists.txt'
--- Percona-Server/scripts/CMakeLists.txt	2013-10-09 11:38:45 +0000
+++ Percona-Server/scripts/CMakeLists.txt	2013-12-23 00:18:44 +0000
@@ -236,7 +236,7 @@
 ENDIF()
 
 # Use cmake variables to inspect dependencies for 
-# mysqlclient library (add -l stuff)
+# perconaserverclient library (add -l stuff)
 SET(CLIENT_LIBS "")
 SET(LIBS "")
 
@@ -276,7 +276,7 @@
   ENDIF()
 ENDMACRO()
 
-EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS)
+EXTRACT_LINK_LIBRARIES(perconaserverclient CLIENT_LIBS)
 EXTRACT_LINK_LIBRARIES(mysqlserver LIBS)
 
 # mysql_config evaluates ${LIBDL}, we want to avoid it

=== modified file 'Percona-Server/scripts/mysql_config.pl.in'
--- Percona-Server/scripts/mysql_config.pl.in	2011-06-30 15:46:53 +0000
+++ Percona-Server/scripts/mysql_config.pl.in	2013-12-23 00:18:44 +0000
@@ -183,15 +183,15 @@
   my $linkpath   = "$pkglibdir";
   # user32 is only needed for debug or embedded
   my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib");
-  @lib_opts   = ("$linkpath/mysqlclient.lib",@winlibs);
+  @lib_opts   = ("$linkpath/perconaserverclient.lib",@winlibs);
   @lib_r_opts = @lib_opts;
   @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs);
 }
 else
 {
   my $linkpath   = "-L$pkglibdir";
-  @lib_opts   = ($linkpath,"-lmysqlclient");
-  @lib_r_opts = ($linkpath,"-lmysqlclient_r");
+  @lib_opts   = ($linkpath,"-lperconaserverclient");
+  @lib_r_opts = ($linkpath,"-lperconaserverclient_r");
   @lib_e_opts = ($linkpath,"-lmysqld");
 }
 

=== modified file 'Percona-Server/scripts/mysql_config.sh'
--- Percona-Server/scripts/mysql_config.sh	2011-06-30 15:46:53 +0000
+++ Percona-Server/scripts/mysql_config.sh	2013-12-23 00:18:44 +0000
@@ -110,9 +110,9 @@
 
 # Create options 
 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
+libs=" $ldflags -L$pkglibdir -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+libs_r=" $ldflags -L$pkglibdir -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
 embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 
 if [ -r "$pkglibdir/libmygcc.a" ]; then

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2007-05-29 21:39:57 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2007-05-29 21:39:57 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2006-09-01 13:14:50 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2006-09-01 13:14:50 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2013-12-23 00:18:44 +0000
@@ -14,7 +14,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_event/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2006-09-01 13:14:50 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2006-09-01 13:14:50 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2013-12-23 00:18:44 +0000
@@ -14,7 +14,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2006-09-01 13:14:50 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2006-09-01 13:14:50 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2007-05-29 21:39:57 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings  -lz $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)

=== modified file 'Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile'
--- Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2007-05-29 21:39:57 +0000
+++ Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2013-12-23 00:18:44 +0000
@@ -15,7 +15,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_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)

=== modified file 'Percona-Server/storage/ndb/test/ndbapi/Makefile.am'
--- Percona-Server/storage/ndb/test/ndbapi/Makefile.am	2013-02-26 05:35:17 +0000
+++ Percona-Server/storage/ndb/test/ndbapi/Makefile.am	2013-12-23 00:18:44 +0000
@@ -101,7 +101,7 @@
 testLcp_SOURCES = testLcp.cpp
 testPartitioning_SOURCES = testPartitioning.cpp
 testNDBT_SOURCES = testNDBT.cpp
-testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libmysqlclient_r.la
+testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libperconaserverclient_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
@@ -123,7 +123,7 @@
 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/libmysqlclient_r.la
+NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libperconaserverclient_r.la
 
 windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
              testScan.dsp

=== modified file 'Percona-Server/support-files/MySQL-shared-compat.spec.sh'
--- Percona-Server/support-files/MySQL-shared-compat.spec.sh	2013-04-18 10:52:59 +0000
+++ Percona-Server/support-files/MySQL-shared-compat.spec.sh	2013-12-23 00:18:44 +0000
@@ -82,7 +82,7 @@
 
 %files
 %defattr(-, root, root)
-%{_libdir}/libmysqlclient*
+%{_libdir}/libperconaserverclient*
 
 # The spec file changelog only includes changes made to the spec file
 # itself - note that they must be ordered by date (important when

=== modified file 'Percona-Server/support-files/mysql.spec.sh'
--- Percona-Server/support-files/mysql.spec.sh	2013-10-30 03:12:24 +0000
+++ Percona-Server/support-files/mysql.spec.sh	2013-12-23 00:18:44 +0000
@@ -702,7 +702,7 @@
   rpm -qa | grep -i '^mysql-'
 
   You may choose to use 'rpm --nodeps -ev <package-name>' to remove
-  the package which contains the mysqlclient shared library.  The
+  the package which contains the perconaserverclient 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
@@ -1175,8 +1175,8 @@
 %dir %attr(755, root, root) %{_libdir}/mysql
 %{_includedir}/mysql/*
 %{_datadir}/aclocal/mysql.m4
-%{_libdir}/mysql/libmysqlclient.a
-%{_libdir}/mysql/libmysqlclient_r.a
+%{_libdir}/mysql/libperconaserverclient.a
+%{_libdir}/mysql/libperconaserverclient_r.a
 %{_libdir}/mysql/libmysqlservices.a
 
 # ----------------------------------------------------------------------------

=== modified file 'Percona-Server/tests/CMakeLists.txt'
--- Percona-Server/tests/CMakeLists.txt	2013-02-26 05:35:17 +0000
+++ Percona-Server/tests/CMakeLists.txt	2013-12-23 00:18:44 +0000
@@ -18,12 +18,12 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
-TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)
+TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient)
 SET_TARGET_PROPERTIES(mysql_client_test PROPERTIES LINKER_LANGUAGE CXX)
 
 IF(WITH_UNIT_TESTS)
   ADD_EXECUTABLE(bug25714 bug25714.c)
-  TARGET_LINK_LIBRARIES(bug25714 mysqlclient)
+  TARGET_LINK_LIBRARIES(bug25714 perconaserverclient)
   SET_TARGET_PROPERTIES(bug25714 PROPERTIES LINKER_LANGUAGE CXX)
 ENDIF()
 

=== modified file 'build/debian/control'
--- build/debian/control	2013-10-08 21:55:32 +0000
+++ build/debian/control	2013-12-23 00:18:44 +0000
@@ -8,7 +8,7 @@
 Homepage: http://www.percona.com/software/percona-server/
 Vcs-Bzr: lp:percona-server/5.5
 
-Package: libmysqlclient18
+Package: libperconaserverclient18
 Section: libs
 Architecture: any
 Replaces: libpercona-server-client18
@@ -21,13 +21,28 @@
  .
  This package includes the client library.
 
-Package: libmysqlclient18-dev
+Package: libperconaserverclient18-dev
 Architecture: any
 Section: libdevel
+<<<<<<< TREE
 Depends: libmysqlclient18 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
 Replaces: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev, libpercona-xtradb-client-dev
 Provides: libmysqlclient-dev
+=======
+Depends: libperconaserverclient-dev (= ${binary:Version}), ${misc:Depends}
+Description: Percona Server database development files - empty transitional 
+ package. This is an empty package that depends on libperconaserverclient-dev
+ to ease the transition for packages with versioned build-deps on
+ libperconaserverclient18-dev.
+
+Package: libperconaserverclient-dev
+Architecture: any
+Section: libdevel
+Depends: libperconaserverclient18 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}
+Conflicts: libperconaserverclient14-dev, libperconaserverclient12-dev, libperconaserverclient10-dev, libperconaserverclient15-dev, libperconaserverclient16-dev, libmysqlclient-dev
+Replaces: libperconaserverclient14-dev, libperconaserverclient12-dev, libperconaserverclient10-dev, libperconaserverclient15-dev, libperconaserverclient16-dev, libpercona-xtradb-client-dev
+>>>>>>> MERGE-SOURCE
 Description: Percona Server database development files
  Percona Server is a fast, stable and true multi-user, multi-threaded SQL 
  database server. SQL (Structured Query Language) is the most popular 
@@ -54,7 +69,7 @@
 
 Package: percona-server-client-5.5
 Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.5 (>= ${source:Version}), libmysqlclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
+Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.5 (>= ${source:Version}), libperconaserverclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
 Provides: mysql-client, mysql-client-core, mysql-client-5.5, mysql-client-core-5.5, virtual-mysql-client
 Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0, percona-server-client-5.1
 Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0, percona-server-client-5.1

=== modified file 'build/debian/libmysqlclient18-dev.install'
--- build/debian/libmysqlclient18-dev.install	2013-10-04 15:43:34 +0000
+++ build/debian/libmysqlclient18-dev.install	2013-12-23 00:18:44 +0000
@@ -1,7 +1,7 @@
 usr/bin/mysql_config
 usr/include
-usr/lib/libmysqlclient.a
-usr/lib/libmysqlclient_r.a
+usr/lib/libperconaserverclient.a
+usr/lib/libperconaserverclient_r.a
 usr/lib/libmysqlservices.a
 usr/lib/libhsclient.a
 usr/share/man/man1/mysql_config.1

=== modified file 'build/debian/libmysqlclient18-dev.links'
--- build/debian/libmysqlclient18-dev.links	2013-10-04 15:43:34 +0000
+++ build/debian/libmysqlclient18-dev.links	2013-12-23 00:18:44 +0000
@@ -1,2 +1,2 @@
-usr/lib/libmysqlclient.so.18	usr/lib/libmysqlclient.so
-usr/lib/libmysqlclient_r.so.18	usr/lib/libmysqlclient_r.so
+usr/lib/libperconaserverclient.so.18	usr/lib/libperconaserverclient.so
+usr/lib/libperconaserverclient_r.so.18	usr/lib/libperconaserverclient_r.so

=== modified file 'build/debian/libmysqlclient18.install'
--- build/debian/libmysqlclient18.install	2013-10-02 18:40:21 +0000
+++ build/debian/libmysqlclient18.install	2013-12-23 00:18:44 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 usr/lib/libmysqlclient*.so.18.*
+=======
+usr/lib/libperconaserverclient*.so.*
+>>>>>>> MERGE-SOURCE

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-10-23 08:23:08 +0000
+++ build/percona-server.spec	2013-12-23 00:18:44 +0000
@@ -648,7 +648,7 @@
   rpm -qa | grep -i '^mysql-'
 
   You may choose to use 'rpm --nodeps -ev <package-name>' to remove
-  the package which contains the mysqlclient shared library.  The
+  the package which contains the perconaserverclient 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
@@ -1168,8 +1168,8 @@
 %{_includedir}/mysql/*
 %{_includedir}/handlersocket
 %{_datadir}/aclocal/mysql.m4
-%{_libdir}/mysql/libmysqlclient.a
-%{_libdir}/mysql/libmysqlclient_r.a
+%{_libdir}/mysql/libperconaserverclient.a
+%{_libdir}/mysql/libperconaserverclient_r.a
 %{_libdir}/mysql/libmysqlservices.a
 %{_libdir}/mysql/libhsclient.a
 %{_libdir}/libhsclient.la

=== modified file 'build/percona-shared-compat.spec'
--- build/percona-shared-compat.spec	2013-10-23 08:23:08 +0000
+++ build/percona-shared-compat.spec	2013-12-23 00:18:44 +0000
@@ -85,7 +85,7 @@
 #rpm2cpio %{SOURCE1} | cpio -iv --make-directories
 #rpm2cpio %{SOURCE2} | cpio -iv --make-directories
 #rpm2cpio %{SOURCE3} | cpio -iv --make-directories
-rpm2cpio %{SOURCE1} | cpio -ivu '*/usr/lib64/libmysqlclient*so.16*'
+rpm2cpio %{SOURCE1} | cpio -ivu '*/usr/lib64/libperconaserverclient*so.16*'
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 
 %clean
@@ -93,5 +93,5 @@
 
 %files
 %defattr(-, root, root)
-%{_libdir}/libmysqlclient*
+%{_libdir}/libperconaserverclient*
 

=== modified file 'build/rpm/mysql-dubious-exports.patch'
--- build/rpm/mysql-dubious-exports.patch	2013-02-04 17:07:22 +0000
+++ build/rpm/mysql-dubious-exports.patch	2013-12-23 00:18:44 +0000
@@ -1,6 +1,6 @@
 Prefix mysql_ to the real names of several symbols that have to be exported
-from libmysqlclient because mysql-connector-odbc and/or PHP depend on them.
-This limits the intrusion on application namespace.
+from libperconaserverclient because mysql-connector-odbc and/or PHP depend on
+them. This limits the intrusion on application namespace.
 
 Also, remove all traces of make_scrambled_password and
 make_scrambled_password_323, so that references to these functions draw

=== modified file 'doc/source/installation.rst'
--- doc/source/installation.rst	2013-05-27 13:46:13 +0000
+++ doc/source/installation.rst	2013-12-23 00:18:44 +0000
@@ -131,10 +131,10 @@
 
 The ``percona-server-dfsg`` package contains....
 
-The ``libmysqlclient-dev`` package contains header files needed to
+The ``libperconaserverclient-dev`` package contains header files needed to
 compile software to use the client library.
 
-The ``libmysqlclient18`` package contains the client shared
+The ``libperconaserverclient18`` package contains the client shared
 library. The ``18`` is a reference to the version of the shared
 library. The version is incremented when there is a ABI change that
 requires software using the client library to be recompiled or their

=== modified file 'doc/source/management/pam_plugin.rst'
--- doc/source/management/pam_plugin.rst	2013-07-02 11:56:23 +0000
+++ doc/source/management/pam_plugin.rst	2013-12-23 00:18:44 +0000
@@ -6,7 +6,7 @@
 
 Percona PAM Authentication Plugin is a free and Open Source implementation of the |MySQL|'s authentication plugin. This plugin acts as a mediator between the |MySQL| server, the |MySQL| client, and the PAM stack. The server plugin requests authentication from the PAM stack, forwards any requests and messages from the PAM stack over the wire to the client (in cleartext) and reads back any replies for the PAM stack.
 
- PAM plugin uses dialog as its client side plugin. Dialog plugin can be loaded to any client application that uses :file:`libmysqlclient` library.
+ PAM plugin uses dialog as its client side plugin. Dialog plugin can be loaded to any client application that uses :file:`libperconaserverclient`/:file:`libperconaserverclient` library.
 
 Here are some of the benefits that Percona dialog plugin offers over the default one:
 

=== modified file 'doc/source/upgrading_guide_51_55.rst'
--- doc/source/upgrading_guide_51_55.rst	2013-12-19 12:22:20 +0000
+++ doc/source/upgrading_guide_51_55.rst	2013-12-23 00:18:44 +0000
@@ -385,7 +385,7 @@
 
   * ``percona-server-common-5.5``
 
-  * ``libmysqlclient16``
+  * ``libperconaserverclient16``
 
 At the moment of writing this guide, for *Ubuntu* Maverick on ``i686``, a way of doing this is: ::