--- client/base/CMakeLists.txt	2018-08-18 03:29:34.986169793 -0400
+++ client/base/CMakeLists.txt	2018-08-18 03:29:34.991586542 -0400
@@ -46,4 +46,4 @@
   ${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc
 )
 
-TARGET_LINK_LIBRARIES(client_base perconaserverclient)
+TARGET_LINK_LIBRARIES(client_base mysqlclient)
--- client/CMakeLists.txt	2018-08-18 03:29:59.708213642 -0400
+++ client/CMakeLists.txt	2018-08-18 03:29:59.712547041 -0400
@@ -40,13 +40,13 @@ MYSQL_ADD_EXECUTABLE(mysql
   pattern_matcher.cc
   readline.cc
   client_query_attributes.cc
-  LINK_LIBRARIES perconaserverclient client_base ${MY_READLINE_LIBRARY}
+  LINK_LIBRARIES mysqlclient client_base ${MY_READLINE_LIBRARY}
   )
 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
     upgrade/program.cc
-    LINK_LIBRARIES perconaserverclient client_base
+    LINK_LIBRARIES mysqlclient client_base
     )
 ENDIF()
 
@@ -72,24 +72,24 @@ MYSQL_ADD_EXECUTABLE(mysqltest
   COMPONENT Test
   DEPENDENCIES GenError GenClientError
   ENABLE_EXPORTS
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqlcheck
   check/mysqlcheck.cc
   check/mysqlcheck_core.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqldump
   mysqldump.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqlimport
   mysqlimport.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqlshow
   mysqlshow.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 
 OPTION(WITH_JSON_BINLOG_LIBRARY
@@ -221,7 +221,7 @@ SET(MYSQLBINLOG_SOURCES
 SET(MYSQLBINLOG_LIBRARIES
   binlogevents_static
   client_base
-  perconaserverclient
+  mysqlclient
   )
 
 IF(WITH_JSON_BINLOG_LIBRARY)
@@ -254,19 +254,19 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
 
 MYSQL_ADD_EXECUTABLE(mysqladmin
   mysqladmin.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqlslap
   mysqlslap.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysql_config_editor
   mysql_config_editor.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation
   mysql_secure_installation.cc
-  LINK_LIBRARIES perconaserverclient
+  LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
   logger.cc
--- client/migrate_keyring/CMakeLists.txt
+++ client/migrate_keyring/CMakeLists.txt
@@ -40,7 +40,7 @@ SET(MIGRATE_KEYRING_LIBRARIES
   ${CMAKE_DL_LIBS}
   minchassis
   mysys
-  perconaserverclient
+  mysqlclient
   client_base
   ${SSL_LIBRARIES}
 )
--- include/mysql.h	2018-08-18 03:30:11.721480261 -0400
+++ include/mysql.h	2018-08-18 03:30:11.727980360 -0400
@@ -28,7 +28,7 @@
 /**
   @file include/mysql.h
   This file defines the client API to MySQL and also the ABI of the
-  dynamically linked libperconaserverclient.
+  dynamically linked libmysqlclient.
 
   The ABI should never be changed in a released product of MySQL,
   thus you need to take great care when changing the file. In case
@@ -399,12 +399,12 @@
 
 /*
   mysql_server_init/end need to be called when using libmysqld or
-  libperconaserverclient (exactly, mysql_server_init() is called by
+  libmysqlclient (exactly, mysql_server_init() is called by
   mysql_init() so you don't need to call it explicitely; but you need to call
   mysql_server_end() to free memory). The names are a bit misleading
   (mysql_SERVER* to be used when using libmysqlCLIENT). So we add more general
   names which suit well whether you're using libmysqld or
-  libperconaserverclient. We intend to promote these aliases over the
+  libmysqlclient. We intend to promote these aliases over the
   mysql_server* ones.
 */
 #define mysql_library_init mysql_server_init
--- libmysql/CMakeLists.txt	2018-08-18 03:30:19.520515918 -0400
+++ libmysql/CMakeLists.txt	2018-08-18 03:30:19.525932667 -0400
@@ -273,13 +273,13 @@ ENDIF()
 # LDAP authentication SASL client plugin
 ADD_SUBDIRECTORY(authentication_ldap)
 
-# Merge several convenience libraries into one big perconaserverclient
-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development)
-TARGET_LINK_LIBRARIES(perconaserverclient PRIVATE ${LIBS_TO_LINK})
+# Merge several convenience libraries into one big mysqlclient
+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
+TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
 
 # 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(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
   INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
@@ -308,7 +308,7 @@ IF(UNIX)
   ENDMACRO()
 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_SHARED(libmysql ${LIBS_TO_MERGE}
   EXPORTS
@@ -340,9 +340,9 @@ IF(UNIX)
     SET(OS_SHARED_LIB_VERSION
       "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.${SHARED_LIB_PATCH_VERSION}")
   ENDIF()
-  # Name of shared library is perconaserverclient on Unix
+  # Name of shared library is mysqlclient on Unix
   SET_TARGET_PROPERTIES(libmysql PROPERTIES 
-    OUTPUT_NAME perconaserverclient 
+    OUTPUT_NAME mysqlclient 
     VERSION "${OS_SHARED_LIB_VERSION}" 
     SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
   CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
@@ -364,8 +364,8 @@ IF(UNIX)
       "LINKER:--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver")
   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)
 
 ENDIF()
--- scripts/CMakeLists.txt	2018-08-18 03:31:39.003728628 -0400
+++ scripts/CMakeLists.txt	2018-08-18 03:31:39.009145377 -0400
@@ -365,7 +365,7 @@
 ENDIF()
 
 # Use cmake variables to inspect dependencies for 
-# perconaserverclient library (add -l stuff)
+# mysqlclient library (add -l stuff)
 SET(CLIENT_LIBS "")
 SET(LIBS "")
 
@@ -398,11 +398,11 @@
   STRING(REGEX REPLACE "[ ]+$" "" ${var} "${${var}}")
 ENDMACRO()
 
-EXTRACT_LINK_LIBRARIES(perconaserverclient CLIENT_LIBS)
+EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS)
 
 IF(MSVC)
-  GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION perconaserverclient VERSION)
-  GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME perconaserverclient OUTPUT_NAME)
+  GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION)
+  GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME)
 ELSE()
   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION)
   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)
--- storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2018-08-18 03:31:53.867288716 -0400
+++ storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile	2018-08-18 03:31:53.870538766 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2018-08-18 03:32:01.879744295 -0400
+++ storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2018-08-18 03:32:01.884077695 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi  -I$(INCLUDE_DIR)/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2018-08-18 03:32:11.933231001 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_async/Makefile	2018-08-18 03:32:11.936481050 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2018-08-18 03:32:17.497315889 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_async1/Makefile	2018-08-18 03:32:17.501649289 -0400
@@ -35,7 +35,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_blob/Makefile	2018-08-18 03:32:25.159849464 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_blob/Makefile	2018-08-18 03:32:25.163099513 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile	2018-08-18 03:32:34.693328250 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile	2018-08-18 03:32:34.697661649 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2018-08-18 03:32:39.731988459 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_event/Makefile	2018-08-18 03:32:39.736321858 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS) Makefile
 	$(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile	2018-08-18 03:32:51.553502151 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile	2018-08-18 03:32:51.558918901 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2018-08-18 03:33:03.477934084 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_retries/Makefile	2018-08-18 03:33:03.483350833 -0400
@@ -35,7 +35,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS)  -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2018-08-18 03:33:11.319220386 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_scan/Makefile	2018-08-18 03:33:11.322470436 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2018-08-18 03:33:20.103021067 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_simple/Makefile	2018-08-18 03:33:20.107354466 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2018-08-18 03:33:28.880321646 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile	2018-08-18 03:33:28.884655046 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2018-08-18 03:33:37.747540266 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile	2018-08-18 03:33:37.752957016 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
--- storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile	2018-08-18 03:33:46.284337179 -0400
+++ storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile	2018-08-18 03:33:46.289753929 -0400
@@ -36,7 +36,7 @@
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET)
 
 $(OBJS): $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
--- storage/ndb/test/run-test/CMakeLists.txt	2018-08-18 03:33:54.833050942 -0400
+++ storage/ndb/test/run-test/CMakeLists.txt	2018-08-18 03:33:54.837384341 -0400
@@ -46,7 +46,7 @@
   test_execution_resources.cpp
   DESTINATION mysql-test/ndb
   ENABLE_EXPORTS
-  LINK_LIBRARIES ndbNDBT ndbclient_static perconaserverclient
+  LINK_LIBRARIES ndbNDBT ndbclient_static mysqlclient
   )
 
 FILE(GLOB testcase_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*-tests.txt")
--- testclients/CMakeLists.txt	2018-08-18 03:34:01.038478951 -0400
+++ testclients/CMakeLists.txt	2018-08-18 03:34:01.042812350 -0400
@@ -23,9 +23,9 @@
 ADD_WSHADOW_WARNING()
 
 MYSQL_ADD_EXECUTABLE(mysql_client_test mysql_client_test.cc COMPONENT Test)
-TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient)
+TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)
 
 IF(WITH_UNIT_TESTS)
   MYSQL_ADD_EXECUTABLE(bug25714 bug25714.cc SKIP_INSTALL)
-  TARGET_LINK_LIBRARIES(bug25714 perconaserverclient)
+  TARGET_LINK_LIBRARIES(bug25714 mysqlclient)
 ENDIF()
--- plugin/percona-pam-for-mysql/CMakeLists.txt 2018-08-21 07:01:38.155232659 -0400
+++ plugin/percona-pam-for-mysql/CMakeLists.txt 2018-08-21 07:02:18.194400527 -0400
@@ -36,7 +36,7 @@
   MYSQL_ADD_PLUGIN(dialog
                    src/dialog.cc
                    ../../sql-common/get_password.cc
-                   LINK_LIBRARIES perconaserverclient
+                   LINK_LIBRARIES mysqlclient
                    MODULE_ONLY)
 
   IF(UNIX)
--- unittest/gunit/group_replication/CMakeLists.txt     2018-08-22 01:55:48.775894920 -0400
+++ unittest/gunit/group_replication/CMakeLists.txt     2018-08-22 01:56:19.804229110 -0400
@@ -40,7 +40,7 @@
     LINK_LIBRARIES
     gr_unit_test_resource
     gunit_small
-    perconaserverclient
+    mysqlclient
     mysqlgcs
     )
 ENDFOREACH()
--- plugin/x/tests/driver/CMakeLists.txt	2018-08-22 03:58:32.371339263 -0400
+++ plugin/x/tests/driver/CMakeLists.txt	2018-08-22 03:58:46.195045928 -0400
@@ -79,7 +79,7 @@
   LINK_LIBRARIES
   mysys
   strings
-  perconaserverclient
+  mysqlclient
   ${MYSQLX_CLIENT_FULL_LIB}
   ${MYSQLX_PROTOCOL_FULL_LIB}
   ${PROTOBUF_LIBRARY}
--- router/src/metadata_cache/CMakeLists.txt   2019-12-04 10:04:41.972129557 +0200
+++ router/src/metadata_cache/CMakeLists.txt 2019-12-04 10:06:40.135965582 +0200
@@ -67,7 +67,7 @@
   ADD_LIBRARY(metadata_cache_static STATIC ${METADATA_CACHE_SOURCES})
   TARGET_LINK_LIBRARIES(metadata_cache_static
     router_lib
-    perconaserverclient
+    mysqlclient
     mysqlxmessages_lite
     ${PROTOBUF_LITE_LIBRARY}
     )
--- router/src/metadata_cache/tests/CMakeLists.txt      2019-12-04 10:04:41.972129557 +0200
+++ router/src/metadata_cache/tests/CMakeLists.txt      2019-12-04 10:08:31.859600010 +0200
@@ -55,7 +55,7 @@
   ADD_LIBRARY(metadata_cache_tests SHARED ${METADATA_CACHE_TESTS_HELPER})
   TARGET_LINK_LIBRARIES(metadata_cache_tests
     router_lib
-    perconaserverclient
+    mysqlclient
     mysqlxclient_lite
     mysqlxmessages_lite
     ${PROTOBUF_LITE_LIBRARY}
@@ -65,7 +65,7 @@
   TARGET_LINK_LIBRARIES(metadata_cache_tests
     router_lib
     metadata_cache
-    perconaserverclient
+    mysqlclient
     mysqlxclient_lite
     mysqlxmessages_lite
     ${PROTOBUF_LITE_LIBRARY}
--- router/src/router/src/CMakeLists.txt        2019-12-04 10:04:41.980129555 +0200
+++ router/src/router/src/CMakeLists.txt        2019-12-04 10:10:55.818892238 +0200
@@ -71,7 +71,7 @@ TARGET_LINK_LIBRARIES(router_lib
   ${CMAKE_DL_LIBS}
   harness-library
   harness_stdx
-  perconaserverclient
+  mysqlclient
   ${SSL_LIBRARIES}
   io_component
   )
--- router/tests/fuzzers/CMakeLists.txt 2019-12-04 10:04:41.996129551 +0200
+++ router/tests/fuzzers/CMakeLists.txt 2019-12-04 10:11:53.090550318 +0200
@@ -32,7 +32,7 @@
 
     LINK_LIBRARIES
     harness-library
-    perconaserverclient
+    mysqlclient
     ${SSL_LIBRARIES}
 
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -59,7 +59,7 @@
 
     LINK_LIBRARIES
     harness-library
-    perconaserverclient
+    mysqlclient
     ${SSL_LIBRARIES}
 
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}