summaryrefslogtreecommitdiff
path: root/sql/udf_example.c
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-02 16:38:04 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-02 16:38:04 -0300
commit74283a052e092d822091343dc236debf0aaf55cc (patch)
tree3c6e29d5a9d1f0a067dcdf4cca5b5747721aee89 /sql/udf_example.c
parent02de8f68a5a0fcf4ff9df6014b3c49a0cba9183d (diff)
parent93fb8bb23544a4b5b2a4a6e43e1c25d74ca9a6f0 (diff)
downloadmariadb-git-74283a052e092d822091343dc236debf0aaf55cc.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/udf_example.c')
-rw-r--r--sql/udf_example.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/udf_example.c b/sql/udf_example.c
index fa1b44178ac..284689d329f 100644
--- a/sql/udf_example.c
+++ b/sql/udf_example.c
@@ -146,7 +146,9 @@ typedef long long longlong;
#ifdef HAVE_DLOPEN
+#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_SOLARIS_STYLE_GETHOST)
static pthread_mutex_t LOCK_hostname;
+#endif
/* These must be right or mysqld will not find the symbol! */