summaryrefslogtreecommitdiff
path: root/sql/udf_example.cc
diff options
context:
space:
mode:
authorpem@mysql.com <>2003-12-18 17:51:43 +0100
committerpem@mysql.com <>2003-12-18 17:51:43 +0100
commit7b13840a4674ca022c9f3dd20a19903f7f447b6d (patch)
treeeaba5705584c698b769abc4d4a369b1b8d393264 /sql/udf_example.cc
parentecf54df991c6814077ab58d99b0826053963c8c7 (diff)
parent3ddbc9872a5e0d0c4cabedf2565ed0c2e8cc66db (diff)
downloadmariadb-git-7b13840a4674ca022c9f3dd20a19903f7f447b6d.tar.gz
Merge
Diffstat (limited to 'sql/udf_example.cc')
-rw-r--r--sql/udf_example.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/udf_example.cc b/sql/udf_example.cc
index 6748be5a06f..f0f33ed6fd7 100644
--- a/sql/udf_example.cc
+++ b/sql/udf_example.cc
@@ -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
}