Attachment #762936 for bug #831664

View | Details | Raw Unified | Return to bug 831664
Collapse All | Expand All

Lines 282-289 Link Here

(-)a/jdbc/FindMySQL.cmake (-2 / +2 lines)
282	# there, pick "libmysqlclient" that in 5.5 and up is multithreaded	282	# there, pick "libmysqlclient" that in 5.5 and up is multithreaded
283	# anyway (soft link "libmysqlclient_r" is not installed MySQL Server	283	# anyway (soft link "libmysqlclient_r" is not installed MySQL Server
284	# 5.6 and Debian/Ubuntu and might go in 5.7 for all installs)	284	# 5.6 and Debian/Ubuntu and might go in 5.7 for all installs)
285	set(_dynamic_libs "mysqlclient_r" "mysqlclient")	285	set(_dynamic_libs "mysqlclient")
286	set(_static_libs "libmysqlclient_r.a" "libmysqlclient.a")	286	set(_static_libs "libmysqlclient.a")
287	set(_static_lib_ext ".a")	287	set(_static_lib_ext ".a")
288	endif()	288	endif()
289		289

Lines 49-55 Link Here

(-)a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp (-1 / +1 lines)
49	#elif defined(__hpux) && defined(__hppa)	49	#elif defined(__hpux) && defined(__hppa)
50	static const char * const baseName = "libmysqlclient_r.sl";	50	static const char * const baseName = "libmysqlclient_r.sl";
51	#else	51	#else
52	static const char * const baseName = "libmysqlclient_r.so";	52	static const char * const baseName = "libmysqlclient.so";
53	#endif	53	#endif
54		54
55	template<typename FunctionType>	55	template<typename FunctionType>

Return to bug 831664