diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-12 15:13:16 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-12 15:13:16 +0200 |
| commit | 0a8d876d1480f2da2f6783378ce5cfea6e45b0fb (patch) | |
| tree | 90ca5269b114f88c1195777a2595d1e9ba68693e /mysql-test | |
| parent | 10633fd8397f8450b5076bb98f336f6d20967b5d (diff) | |
| download | mariadb-git-0a8d876d1480f2da2f6783378ce5cfea6e45b0fb.tar.gz | |
Bug#18564 Test failure due to test not checking preconditions
- Add variable "have_dynamic_loading" and use it to check if the udf test should be run.
mysql-test/include/have_udf.inc:
Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/r/have_udf.require:
Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/t/disabled.def:
Remove udf from disabled
sql/mysql_priv.h:
Add have_dlopen variable
sql/mysqld.cc:
Add have_dlopen variable
sql/set_var.cc:
Add have_dlopen variable and name it "have_dynamic_loading" in "SHOW VARIABLES"
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_udf.inc | 14 | ||||
| -rw-r--r-- | mysql-test/r/have_udf.require | 3 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
3 files changed, 7 insertions, 11 deletions
diff --git a/mysql-test/include/have_udf.inc b/mysql-test/include/have_udf.inc index a22b2a52e61..b6e6f0f2516 100644 --- a/mysql-test/include/have_udf.inc +++ b/mysql-test/include/have_udf.inc @@ -1,12 +1,8 @@ # -# To check if the udf_example.so is available, -# try to load one function from it. -# +# Check if server has support for loading udf's +# i.e it will support dlopen # --require r/have_udf.require ---disable_abort_on_error -CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so'; ---disable_query_log -DROP FUNCTION metaphon; ---enable_query_log ---enable_abort_on_error +disable_query_log; +show variables like "have_dynamic_loading"; +enable_query_log; diff --git a/mysql-test/r/have_udf.require b/mysql-test/r/have_udf.require index 869d1b254fd..2d21f65e4ac 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_dynamic_loading YES diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index a836b1a2897..f71e24ff3ed 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -12,4 +12,3 @@ sp-goto : GOTO is currently is disabled - will be fixed in the future ndb_load : Bug#17233 -udf : Bug#18564 (Permission by Brian) |