diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
| commit | db260b19e3edb9e153abf784711a3ae13e40db4a (patch) | |
| tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /sql/udf_example.c | |
| parent | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff) | |
| parent | 4a458290441937661136c73afa61393a6634f7b0 (diff) | |
| download | mariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz | |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'sql/udf_example.c')
| -rw-r--r-- | sql/udf_example.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/udf_example.c b/sql/udf_example.c index 9b8f65a4a74..788582e32b6 100644 --- a/sql/udf_example.c +++ b/sql/udf_example.c @@ -139,12 +139,12 @@ typedef long long longlong; #include <mysql.h> #include <ctype.h> +#ifdef HAVE_DLOPEN + #if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_SOLARIS_STYLE_GETHOST) static pthread_mutex_t LOCK_hostname; #endif -#ifdef HAVE_DLOPEN - /* These must be right or mysqld will not find the symbol! */ my_bool metaphon_init(UDF_INIT *initid, UDF_ARGS *args, char *message); |