diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-21 10:54:26 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-21 10:54:26 +0100 |
| commit | ae7974b112f668f749951a6e6825951e6a01ded8 (patch) | |
| tree | 9ab08d577a0241130d460fe61c9e0550cf8bc163 /mysql-test/r | |
| parent | b16a2fef983d21b0839bc74d2e5a079e872f2fe7 (diff) | |
| download | mariadb-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 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/have_udf.require | 3 | ||||
| -rw-r--r-- | mysql-test/r/udf.result | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/have_udf.require b/mysql-test/r/have_udf.require index 869d1b254fd..6204435c17a 100644 --- a/mysql-test/r/have_udf.require +++ b/mysql-test/r/have_udf.require @@ -1 +1,2 @@ -CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; +Variable_name Value +have_dlopen YES diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index ce9271224dc..1b5f59c038a 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -2,7 +2,7 @@ drop table if exists t1; CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so'; CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME 'udf_example.so'; -ERROR HY000: Can't find function 'myfunc_nonexist' in library +ERROR HY000: Can't find symbol 'myfunc_nonexist' in library CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME 'udf_example.so'; CREATE FUNCTION sequence RETURNS INTEGER SONAME "udf_example.so"; CREATE FUNCTION lookup RETURNS STRING SONAME 'udf_example.so'; |