Skip to content

Commit 9cd128d

Browse files
committed
BUG#19506315 - MYSQL_CONFIG --LIB_R TELLS APPLICATIONS TO LINK WITH LIBMYSQLCLIENT_R
The libmysqlclient_r library was removed in 5.5 and replaced with symlinks to libmysqlclient (as a backwards compatibility measure), since the normal client library is thread safe. This is a partial change for this bug report, let "--libs_r" always output "-lmysqlclient", a reference to the real library and not to the soft link. This solves a problem that on Debian and Ubuntu the deb packages will not install the soft links.
1 parent d9d26e7 commit 9cd128d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

scripts/mysql_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fi
113113
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
114114
libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
115115
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
116-
libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
116+
libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
117117
embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
118118
embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@"
119119

0 commit comments

Comments
 (0)