Bug#11835 CREATE FUNCTION crashes server

 - Don't look for 'dl_open' if mysqld is compiled with "-all-static" 
parent e75a62ae
...@@ -1632,16 +1632,35 @@ else ...@@ -1632,16 +1632,35 @@ else
fi fi
#---END: #---END:
# Check for dlopen, needed for user definable functions # dlopen, dlerror
# This must be checked after threads on AIX case $with_mysqld_ldflags in
# We only need this for mysqld, not for the clients.
*-all-static*)
# No need to check for dlopen when mysqld is linked with
# -all-static as it won't be able to load any functions.
;;
*)
# Check for dlopen, needed for user definable functions
# This must be checked after threads on AIX
# We only need this for mysqld, not for the clients.
my_save_LIBS="$LIBS"
LIBS=""
AC_CHECK_LIB(dl,dlopen)
LIBDL=$LIBS
LIBS="$my_save_LIBS"
AC_SUBST(LIBDL)
my_save_LIBS="$LIBS"
LIBS="$LIBS $LIBDL"
AC_CHECK_FUNCS(dlopen dlerror)
LIBS="$my_save_LIBS"
;;
esac
my_save_LIBS="$LIBS"
LIBS=""
AC_CHECK_LIB(dl,dlopen)
LIBDL=$LIBS
LIBS="$my_save_LIBS"
AC_SUBST(LIBDL)
# System characteristics # System characteristics
case $SYSTEM_TYPE in case $SYSTEM_TYPE in
...@@ -2005,11 +2024,6 @@ then ...@@ -2005,11 +2024,6 @@ then
fi] fi]
) )
my_save_LIBS="$LIBS"
LIBS="$LIBS $LIBDL"
AC_CHECK_FUNCS(dlopen dlerror)
LIBS="$my_save_LIBS"
# Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments) # Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style, AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment