mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge
This commit is contained in:
@ -685,7 +685,7 @@ my_bool lookup_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
|
||||
}
|
||||
initid->max_length=11;
|
||||
initid->maybe_null=1;
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) && defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
(void) pthread_mutex_init(&LOCK_hostname,MY_MUTEX_INIT_SLOW);
|
||||
#endif
|
||||
return 0;
|
||||
@ -693,7 +693,7 @@ my_bool lookup_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
|
||||
|
||||
void lookup_deinit(UDF_INIT *initid)
|
||||
{
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) && defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
(void) pthread_mutex_destroy(&LOCK_hostname);
|
||||
#endif
|
||||
}
|
||||
@ -760,7 +760,7 @@ my_bool reverse_lookup_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
|
||||
}
|
||||
initid->max_length=32;
|
||||
initid->maybe_null=1;
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) && defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
(void) pthread_mutex_init(&LOCK_hostname,MY_MUTEX_INIT_SLOW);
|
||||
#endif
|
||||
return 0;
|
||||
@ -768,7 +768,7 @@ my_bool reverse_lookup_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
|
||||
|
||||
void reverse_lookup_deinit(UDF_INIT *initid)
|
||||
{
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) && defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_SOLARIS_STYLE_GETHOST)
|
||||
(void) pthread_mutex_destroy(&LOCK_hostname);
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user