diff options
| author | pem@mysql.comhem.se <> | 2003-12-18 17:46:56 +0100 |
|---|---|---|
| committer | pem@mysql.comhem.se <> | 2003-12-18 17:46:56 +0100 |
| commit | 3ddbc9872a5e0d0c4cabedf2565ed0c2e8cc66db (patch) | |
| tree | f0796f6233c363604fc06abf277f83f98c94d18a /sql | |
| parent | 7c3ee999d35cdc977647bfa47abca7d04724c7e4 (diff) | |
| download | mariadb-git-3ddbc9872a5e0d0c4cabedf2565ed0c2e8cc66db.tar.gz | |
Corrected faulty #if tests in udf_example.cc which made udf_test crash the server on some
platforms.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/udf_example.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/udf_example.cc b/sql/udf_example.cc index ba056a9d2fd..7e2ee9113b2 100644 --- a/sql/udf_example.cc +++ b/sql/udf_example.cc @@ -681,7 +681,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; @@ -689,7 +689,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 } @@ -756,7 +756,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; @@ -764,7 +764,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 } |