database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Updates for gethostname and gethostbyname_r usage

Browse Source 
configure.in:
  Change "gethostname_r" to "gethostbyname_r" as that is the function
  being looked for
sql/sql_parse.cc:
  gethostname is not used from sql_parse.cc so no need to declare it's
  prototype here
This commit is contained in:
unknown
2006-11-21 11:59:25 +01:00
parent 0f27fa86b2
commit 22204c0ac1
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@@ -2031,7 +2031,7 @@ fi
# Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris) # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
AC_CACHE_CHECK([style of gethostname_r routines], mysql_cv_gethostname_style, AC_CACHE_CHECK([style of gethostbyname_r routines], mysql_cv_gethostbyname_style,
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
@@ -2053,10 +2053,10 @@ AC_TRY_COMPILE(
skr = gethostbyname_r((const char *) 0, skr = gethostbyname_r((const char *) 0,
(struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);], (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);],
mysql_cv_gethostname_style=glibc2, mysql_cv_gethostname_style=other)) mysql_cv_gethostbyname_style=glibc2, mysql_cv_gethostbyname_style=other))
AC_LANG_RESTORE AC_LANG_RESTORE
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS"
if test "$mysql_cv_gethostname_style" = "glibc2" if test "$mysql_cv_gethostbyname_style" = "glibc2"
then then
AC_DEFINE([HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE], [1], AC_DEFINE([HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE], [1],
[Solaris define gethostbyname_r with 5 arguments. glibc2 defines this with 6 arguments]) [Solaris define gethostbyname_r with 5 arguments. glibc2 defines this with 6 arguments])
@@ -2064,7 +2064,7 @@ fi
# Check 3rd argument of getthostbyname_r # Check 3rd argument of getthostbyname_r
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
AC_CACHE_CHECK([3 argument to gethostname_r routines], mysql_cv_gethostname_arg, AC_CACHE_CHECK([3 argument to gethostbyname_r routines], mysql_cv_gethostbyname_arg,
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
@@ -2085,13 +2085,13 @@ AC_TRY_COMPILE(
[int skr; [int skr;
skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (struct hostent_data*) 0);], skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (struct hostent_data*) 0);],
mysql_cv_gethostname_arg=hostent_data, mysql_cv_gethostname_arg=char)) mysql_cv_gethostbyname_arg=hostent_data, mysql_cv_gethostbyname_arg=char))
AC_LANG_RESTORE AC_LANG_RESTORE
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS"
if test "$mysql_cv_gethostname_arg" = "hostent_data" if test "$mysql_cv_gethostbyname_arg" = "hostent_data"
then then
AC_DEFINE([HAVE_GETHOSTBYNAME_R_RETURN_INT], [1], AC_DEFINE([HAVE_GETHOSTBYNAME_R_RETURN_INT], [1],
[In OSF 4.0f the 3'd argument to gethostname_r is hostent_data *]) [In OSF 4.0f the 3'd argument to gethostbyname_r is hostent_data *])
fi fi

4
sql/sql_parse.cc
View File

@@ -62,10 +62,6 @@
(LP)->sql_command == SQLCOM_DROP_FUNCTION ? \ (LP)->sql_command == SQLCOM_DROP_FUNCTION ? \
"FUNCTION" : "PROCEDURE") "FUNCTION" : "PROCEDURE")
#ifdef SOLARIS
extern "C" int gethostname(char *name, int namelen);
#endif
static void time_out_user_resource_limits(THD *thd, USER_CONN *uc); static void time_out_user_resource_limits(THD *thd, USER_CONN *uc);
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
static int check_for_max_user_connections(THD *thd, USER_CONN *uc); static int check_for_max_user_connections(THD *thd, USER_CONN *uc);