summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-03-21 10:54:26 +0100
committerunknown <msvensson@neptunus.(none)>2006-03-21 10:54:26 +0100
commitae7974b112f668f749951a6e6825951e6a01ded8 (patch)
tree9ab08d577a0241130d460fe61c9e0550cf8bc163 /include
parentb16a2fef983d21b0839bc74d2e5a079e872f2fe7 (diff)
downloadmariadb-git-ae7974b112f668f749951a6e6825951e6a01ded8.tar.gz
Bug#11835 CREATE FUNCTION crashes server
- Update for 5.1 - Add "have_dlopen" - Remove requirement to load udf's only in "opt_plugin_dir" include/my_global.h: Remove duplicate defines mysql-test/include/have_udf.inc: Use "have_dlopen" to check if we "have udf" mysql-test/r/have_udf.require: Use "have_dlopen" to check if we "have udf" mysql-test/r/udf.result: Update for new error message "function"->"symbol" sql/item_func.cc: Remove "evil" dbug printour that checks args[0] even if arg_count is 0 sql/mysql_priv.h: Add "have_dlopen" sql/mysqld.cc: Add "have_dlopen" Move HAVE_DLOPEN defined to only surround "udf_free" and "udf_init" sql/set_var.cc: Add "have_dlopen" sql/sql_plugin.cc: Surround 'dlclose' with HAVE_DLOPEN sql/sql_udf.cc: Remove the requirement to load udf's only from "opt_plugin_dir". Fix spelling error
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 56aeb84d9ba..1f53804affe 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1443,13 +1443,4 @@ do { doubleget_union _tmp; \
#define dlerror() ""
#endif
-/* FreeBSD 2.2.2 does not define RTLD_NOW) */
-#ifndef RTLD_NOW
-#define RTLD_NOW 1
-#endif
-
-#ifndef HAVE_DLERROR
-#define dlerror() ""
-#endif
-
#endif /* my_global_h */