1diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt 2--- old/client/CMakeLists.txt 2016-03-03 08:29:59.000000000 +0100 3+++ new/client/CMakeLists.txt 2016-03-03 14:07:22.625678083 +0100 4@@ -32,49 +32,49 @@ 5 6 ADD_DEFINITIONS(${SSL_DEFINES}) 7 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) 8-TARGET_LINK_LIBRARIES(mysql perconaserverclient) 9+TARGET_LINK_LIBRARIES(mysql mysqlclient) 10 IF(UNIX) 11 TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) 12 ENDIF(UNIX) 13 14 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) 15 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") 16-TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) 17+TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) 18 ADD_DEPENDENCIES(mysqltest GenError) 19 20 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) 21-TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) 22+TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) 23 24 MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c) 25-TARGET_LINK_LIBRARIES(mysqldump perconaserverclient) 26+TARGET_LINK_LIBRARIES(mysqldump mysqlclient) 27 28 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) 29-TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) 30+TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) 31 SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") 32 33 MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) 34-TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) 35+TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) 36 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) 37 38 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) 39-TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) 40+TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) 41 42 MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) 43-TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) 44+TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) 45 46 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc 47 ../sql/rpl_filter.cc ../sql/sql_list.cc) 48-TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) 49+TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) 50 51 MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) 52-TARGET_LINK_LIBRARIES(mysqladmin perconaserverclient) 53+TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) 54 55 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) 56 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") 57-TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient) 58+TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) 59 60 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) 61-TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) 62+TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) 63 64 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". 65 IF(WIN32) 66diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt 67--- old/libmysql/CMakeLists.txt 2016-03-03 08:30:00.000000000 +0100 68+++ new/libmysql/CMakeLists.txt 2016-03-03 14:07:22.625678083 +0100 69@@ -204,13 +204,13 @@ 70 LIST(APPEND LIBS_TO_MERGE auth_win_client) 71 ENDIF() 72 73-# Merge several convenience libraries into one big perconaserverclient 74-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development) 75-TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK}) 76+# Merge several convenience libraries into one big mysqlclient 77+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development) 78+TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) 79 80 # Visual Studio users need debug static library for debug projects 81 IF(MSVC) 82- INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug) 83+ INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) 84 INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) 85 ENDIF() 86 87@@ -235,14 +235,14 @@ 88 ENDIF() 89 90 IF(UNIX) 91- GET_TARGET_NAME(perconaserverclient lib_name) 92- INSTALL_SYMLINK(perconaserverclient 93- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a 94+ GET_TARGET_NAME(mysqlclient lib_name) 95+ INSTALL_SYMLINK(mysqlclient 96+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a 97 ${INSTALL_LIBDIR} Development) 98 ENDIF() 99 100 IF(NOT DISABLE_SHARED) 101- # Merge several convenience libraries into one big perconaserverclient 102+ # Merge several convenience libraries into one big mysqlclient 103 # and link them together into shared library. 104 MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE} 105 EXPORTS ${CLIENT_API_FUNCTIONS} 106@@ -256,9 +256,9 @@ 107 SET(OS_SHARED_LIB_VERSION 108 "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0") 109 ENDIF() 110- # Name of shared library is perconaserverclient on Unix 111+ # Name of shared library is mysqlclient on Unix 112 SET_TARGET_PROPERTIES(libmysql PROPERTIES 113- OUTPUT_NAME perconaserverclient 114+ OUTPUT_NAME mysqlclient 115 VERSION "${OS_SHARED_LIB_VERSION}" 116 SOVERSION "${SHARED_LIB_MAJOR_VERSION}") 117 IF(WITH_SYMVER16) 118@@ -285,13 +285,13 @@ 119 PROPERTIES LINK_FLAGS "${libmysql_link_flags}") 120 ENDIF() 121 # clean direct output needs to be set several targets have the same name 122- #(perconaserverclient in this case) 123- SET_TARGET_PROPERTIES(perconaserverclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) 124+ #(mysqlclient in this case) 125+ SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) 126 SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) 127 128- # Install links to libperconaserverclient.so (client_r) 129+ # Install links to libmysqlclient.so (client_r) 130 GET_VERSIONED_LIBNAME( 131- "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r" 132+ "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" 133 "${CMAKE_SHARED_LIBRARY_SUFFIX}" 134 "" 135 linkname) 136@@ -305,7 +305,7 @@ 137 LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS) 138 FOREACH(ver ${OS_SHARED_LIB_SYMLINKS}) 139 GET_VERSIONED_LIBNAME( 140- "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r" 141+ "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" 142 "${CMAKE_SHARED_LIBRARY_SUFFIX}" 143 "${ver}" 144 linkname) 145diff -rup old/libmysql/libmysql.map new/libmysql/libmysql.map 146--- old/libmysql/libmysql.map 2016-03-03 08:30:00.000000000 +0100 147+++ new/libmysql/libmysql.map 2016-03-03 14:07:22.625678083 +0100 148@@ -1,5 +1,5 @@ 149 # symbols exported from mysql 5.1 150-libperconaserverclient_16 { 151+libmysqlclient_16 { 152 global: 153 _fini; 154 _init; 155@@ -124,7 +124,7 @@ libperconaserverclient_16 { 156 *; 157 }; 158 # symbols added in mysql 5.5 159-libperconaserverclient_18 { 160+libmysqlclient_18 { 161 global: 162 mysql_client_find_plugin; 163 mysql_client_register_plugin; 164@@ -136,7 +136,7 @@ libperconaserverclient_18 { 165 # Ideally the following symbols wouldn't be exported, but various applications 166 # require them. We limit the namespace damage by prefixing mysql_ 167 # (see mysql-dubious-exports.patch), which means the symbols are not present 168-# in libperconaserverclient_16. 169+# in libmysqlclient_16. 170 # 171 # mysql-connector-odbc requires these 172 mysql_default_charset_info; 173@@ -149,7 +149,7 @@ libperconaserverclient_18 { 174 my_net_read; 175 }; 176 # symbols added in mysql 5.6 177-libperconaserverclient_18_1 { 178+libmysqlclient_18_1 { 179 global: 180 get_tty_password; 181 }; 182diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in 183--- old/libmysql/libmysql.ver.in 2016-03-02 14:37:17.000000000 +0100 184+++ new/libmysql/libmysql.ver.in 2016-03-03 14:07:22.629678083 +0100 185@@ -1 +1 @@ 186-libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; 187+libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; 188diff -rup old/plugin/percona-pam-for-mysql/CMakeLists.txt new/plugin/percona-pam-for-mysql/CMakeLists.txt 189--- old/plugin/percona-pam-for-mysql/CMakeLists.txt 2016-03-02 14:37:18.000000000 +0100 190+++ new/plugin/percona-pam-for-mysql/CMakeLists.txt 2016-03-03 14:07:22.629678083 +0100 191@@ -31,7 +31,7 @@ 192 SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c) 193 MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) 194 MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) 195- MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES perconaserverclient MODULE_ONLY) 196+ MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY) 197 198 IF(UNIX) 199 IF(INSTALL_MYSQLTESTDIR) 200diff -rup old/scripts/CMakeLists.txt new/scripts/CMakeLists.txt 201--- old/scripts/CMakeLists.txt 2016-03-03 08:30:02.000000000 +0100 202+++ new/scripts/CMakeLists.txt 2016-03-03 14:07:22.629678083 +0100 203@@ -263,7 +263,7 @@ ELSE() 204 ENDIF() 205 206 # Use cmake variables to inspect dependencies for 207-# perconaserverclient library (add -l stuff) 208+# mysqlclient library (add -l stuff) 209 SET(CLIENT_LIBS "") 210 SET(LIBS "") 211 212@@ -303,7 +303,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) 213 ENDIF() 214 ENDMACRO() 215 216-EXTRACT_LINK_LIBRARIES(perconaserverclient CLIENT_LIBS) 217+EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS) 218 EXTRACT_LINK_LIBRARIES(mysqlserver LIBS) 219 220 # mysql_config evaluates ${LIBDL}, we want to avoid it 221diff -rup old/scripts/mysql_config.pl.in new/scripts/mysql_config.pl.in 222--- old/scripts/mysql_config.pl.in 2016-03-03 08:30:02.000000000 +0100 223+++ new/scripts/mysql_config.pl.in 2016-03-03 14:07:22.629678083 +0100 224@@ -182,15 +182,15 @@ if ( $^O eq "MSWin32" ) 225 my $linkpath = "$pkglibdir"; 226 # user32 is only needed for debug or embedded 227 my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib"); 228- @lib_opts = ("$linkpath/perconaserverclient.lib",@winlibs); 229+ @lib_opts = ("$linkpath/mysqlclient.lib",@winlibs); 230 @lib_r_opts = @lib_opts; 231 @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs); 232 } 233 else 234 { 235 my $linkpath = "-L$pkglibdir @RPATH_OPTION@"; 236- @lib_opts = ($linkpath,"-lperconaserverclient"); 237- @lib_r_opts = ($linkpath,"-lperconaserverclient_r"); 238+ @lib_opts = ($linkpath,"-lmysqlclient"); 239+ @lib_r_opts = ($linkpath,"-lmysqlclient_r"); 240 @lib_e_opts = ($linkpath,"-lmysqld"); 241 } 242 243diff -rup old/scripts/mysql_config.sh new/scripts/mysql_config.sh 244--- old/scripts/mysql_config.sh 2016-03-03 08:30:02.000000000 +0100 245+++ new/scripts/mysql_config.sh 2016-03-03 14:10:36.797683283 +0100 246@@ -111,10 +111,10 @@ fi 247 248 # Create options 249 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later 250-libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" 251+libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" 252 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " 253 libs="$libs @QUOTED_CMAKE_C_LINK_FLAGS@" 254-libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " 255+libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " 256 libs_r="$libs_r @QUOTED_CMAKE_C_LINK_FLAGS@" 257 embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " 258 embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@" 259diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 260--- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2016-03-03 08:30:02.000000000 +0100 261+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2016-03-03 14:07:22.633678084 +0100 262@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 263 SYS_LIB = 264 265 $(TARGET): $(OBJS) 266- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 267+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 268 269 $(OBJS): $(SRCS) 270 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) 271diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 272--- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2016-03-03 08:30:02.000000000 +0100 273+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2016-03-03 14:07:22.633678084 +0100 274@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 275 SYS_LIB = 276 277 $(TARGET): $(OBJS) 278- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 279+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 280 281 $(OBJS): $(SRCS) 282 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) 283diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 284--- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2016-03-03 08:30:02.000000000 +0100 285+++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2016-03-03 14:07:22.633678084 +0100 286@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 287 SYS_LIB = 288 289 $(TARGET): $(OBJS) 290- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 291+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 292 293 $(TARGET).o: $(SRCS) 294 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) 295diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 296--- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2016-03-03 08:30:02.000000000 +0100 297+++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2016-03-03 14:07:22.633678084 +0100 298@@ -28,7 +28,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 299 SYS_LIB = 300 301 $(TARGET): $(OBJS) 302- $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 303+ $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 304 305 $(TARGET).o: $(SRCS) 306 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) 307diff -rup old/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile new/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile 308--- old/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile 2016-03-03 08:30:02.000000000 +0100 309+++ new/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile 2016-03-03 14:07:22.633678084 +0100 310@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 311 SYS_LIB = 312 313 $(TARGET): $(OBJS) 314- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 315+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 316 317 $(TARGET).o: $(SRCS) 318 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) 319diff -rup old/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile new/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile 320--- old/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile 2016-03-03 08:30:02.000000000 +0100 321+++ new/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile 2016-03-03 14:07:22.633678084 +0100 322@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 323 SYS_LIB = 324 325 $(TARGET): $(OBJS) 326- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 327+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 328 329 $(OBJS): $(SRCS) 330 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) 331diff -rup old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 332--- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2016-03-03 08:30:02.000000000 +0100 333+++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2016-03-03 14:07:22.633678084 +0100 334@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 335 SYS_LIB = 336 337 $(TARGET): $(OBJS) 338- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 339+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 340 341 $(TARGET).o: $(SRCS) Makefile 342 $(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS) 343diff -rup old/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile new/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile 344--- old/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile 2016-03-03 08:30:02.000000000 +0100 345+++ new/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile 2016-03-03 14:07:22.637678084 +0100 346@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 347 SYS_LIB = 348 349 $(TARGET): $(OBJS) 350- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 351+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 352 353 $(OBJS): $(SRCS) 354 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) 355diff -rup old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 356--- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2016-03-03 08:30:02.000000000 +0100 357+++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2016-03-03 14:07:22.637678084 +0100 358@@ -28,7 +28,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 359 SYS_LIB = 360 361 $(TARGET): $(OBJS) 362- $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 363+ $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 364 365 $(TARGET).o: $(SRCS) 366 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) 367diff -rup old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 368--- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2016-03-03 08:30:02.000000000 +0100 369+++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2016-03-03 14:07:22.637678084 +0100 370@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 371 SYS_LIB = 372 373 $(TARGET): $(OBJS) 374- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 375+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 376 377 $(TARGET).o: $(SRCS) 378 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) 379diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 380--- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2016-03-03 08:30:02.000000000 +0100 381+++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2016-03-03 14:07:22.637678084 +0100 382@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 383 SYS_LIB = 384 385 $(TARGET): $(OBJS) 386- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 387+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 388 389 $(TARGET).o: $(SRCS) 390 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) 391diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 392--- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2016-03-03 08:30:02.000000000 +0100 393+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2016-03-03 14:07:22.637678084 +0100 394@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 395 SYS_LIB = 396 397 $(TARGET): $(OBJS) 398- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 399+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 400 401 $(OBJS): $(SRCS) 402 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) 403diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 404--- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2016-03-03 08:30:02.000000000 +0100 405+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2016-03-03 14:07:22.637678084 +0100 406@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 407 SYS_LIB = 408 409 $(TARGET): $(OBJS) 410- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 411+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 412 413 $(OBJS): $(SRCS) 414 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) 415diff -rup old/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile new/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile 416--- old/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile 2016-03-03 08:30:02.000000000 +0100 417+++ new/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile 2016-03-03 14:07:22.637678084 +0100 418@@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr 419 SYS_LIB = 420 421 $(TARGET): $(OBJS) 422- $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) 423+ $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) 424 425 $(OBJS): $(SRCS) 426 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) 427diff -rup old/storage/ndb/test/run-test/CMakeLists.txt new/storage/ndb/test/run-test/CMakeLists.txt 428--- old/storage/ndb/test/run-test/CMakeLists.txt 2016-03-03 08:30:03.000000000 +0100 429+++ new/storage/ndb/test/run-test/CMakeLists.txt 2016-03-03 14:07:22.637678084 +0100 430@@ -32,7 +32,7 @@ IF(NOT WIN32) 431 ADD_DEFINITIONS(-DDEFAULT_PREFIX=\"${CMAKE_INSTALL_PREFIX}\") 432 ENDIF() 433 ADD_EXECUTABLE(atrt main.cpp setup.cpp files.cpp db.cpp command.cpp) 434-TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient dbug mysys strings perconaserverclient) 435+TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient dbug mysys strings mysqlclient) 436 437 INSTALL(TARGETS atrt DESTINATION mysql-test/ndb) 438 INSTALL(FILES atrt-testBackup atrt-mysql-test-run DESTINATION bin) 439diff -rup old/support-files/MySQL-shared-compat.spec.sh new/support-files/MySQL-shared-compat.spec.sh 440--- old/support-files/MySQL-shared-compat.spec.sh 2016-03-02 14:09:18.000000000 +0100 441+++ new/support-files/MySQL-shared-compat.spec.sh 2016-03-03 14:07:22.637678084 +0100 442@@ -82,7 +82,7 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-di 443 444 %files 445 %defattr(-, root, root) 446-%{_libdir}/libperconaserverclient* 447+%{_libdir}/libmysqlclient* 448 449 # The spec file changelog only includes changes made to the spec file 450 # itself - note that they must be ordered by date (important when 451diff -rup old/support-files/mysql.spec.sh new/support-files/mysql.spec.sh 452--- old/support-files/mysql.spec.sh 2016-03-03 08:30:03.000000000 +0100 453+++ new/support-files/mysql.spec.sh 2016-03-03 14:07:22.641678084 +0100 454@@ -693,7 +693,7 @@ A manual upgrade is required. 455 rpm -qa | grep -i '^mysql-' 456 457 You may choose to use 'rpm --nodeps -ev <package-name>' to remove 458- the package which contains the perconaserverclient shared library. The 459+ the package which contains the mysqlclient shared library. The 460 library will be reinstalled by the MySQL-shared-compat package. 461 - Install the new MySQL packages supplied by $myvendor 462 - Ensure that the MySQL server is started 463@@ -1181,8 +1181,8 @@ echo "=====" 464 %dir %attr(755, root, root) %{_libdir}/mysql 465 %{_includedir}/mysql/* 466 %{_datadir}/aclocal/mysql.m4 467-%{_libdir}/mysql/libperconaserverclient.a 468-%{_libdir}/mysql/libperconaserverclient_r.a 469+%{_libdir}/mysql/libmysqlclient.a 470+%{_libdir}/mysql/libmysqlclient_r.a 471 %{_libdir}/mysql/libmysqlservices.a 472 473 # ---------------------------------------------------------------------------- 474diff -rup old/tests/CMakeLists.txt new/tests/CMakeLists.txt 475--- old/tests/CMakeLists.txt 2016-03-03 08:30:03.000000000 +0100 476+++ new/tests/CMakeLists.txt 2016-03-03 14:07:22.641678084 +0100 477@@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT") 478 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) 479 480 ADD_EXECUTABLE(mysql_client_test mysql_client_test.c) 481-TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient) 482+TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient) 483 SET_TARGET_PROPERTIES(mysql_client_test PROPERTIES LINKER_LANGUAGE CXX) 484 485 IF(WITH_UNIT_TESTS) 486 ADD_EXECUTABLE(bug25714 bug25714.c) 487- TARGET_LINK_LIBRARIES(bug25714 perconaserverclient) 488+ TARGET_LINK_LIBRARIES(bug25714 mysqlclient) 489 SET_TARGET_PROPERTIES(bug25714 PROPERTIES LINKER_LANGUAGE CXX) 490 ENDIF() 491 492