diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-01 14:17:10 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-01 14:17:10 +0200 |
| commit | dcd25bc9f4db6313b0fa0e75f03888f52970ef77 (patch) | |
| tree | 290e7b9ca68fdbcc58714c71951a1a399601dec6 /mysys | |
| parent | 4fbd7817aee31466cf81b5dfcd154eeffd840f67 (diff) | |
| download | mariadb-git-dcd25bc9f4db6313b0fa0e75f03888f52970ef77.tar.gz | |
Fixed gethostname_r tests to be more portable
BUILD/FINISH.sh:
Moved symbolic files to tmp
Docs/manual.texi:
Updated
mysql-test/r/func_str.result:
Removed time functions
mysql-test/t/func_str.test:
Removed time functions
mysql-test/t/order_by.test:
Fixed sort problem
sql/sql_parse.cc:
End transactions before LOCK TABLES
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pthread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index f54e11eae8b..b450bba473d 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -417,7 +417,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr) #if !defined(my_gethostbyname_r) && defined(HAVE_GETHOSTBYNAME_R) -#if defined(HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R) +#if defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) struct hostent *my_gethostbyname_r(const char *name, struct hostent *result, char *buffer, @@ -430,7 +430,7 @@ struct hostent *my_gethostbyname_r(const char *name, return hp; } -#elif defined(_HPUX_SOURCE) || (defined(_AIX) && !defined(_AIX32_THREADS)) +#elif defined(HAVE_GETHOSTBYNAME_R_RETURN_INT) struct hostent *my_gethostbyname_r(const char *name, struct hostent *result, char *buffer, |