bk commit into 5.0 tree (msvensson:1.2151) BUG#18564

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2151 06/04/12 15:13:16 msvensson@neptunus.(none) +6 -0
  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.

  sql/set_var.cc
    1.151 06/04/12 15:13:10 msvensson@neptunus.(none) +1 -0
    Add have_dlopen variable and name it "have_dynamic_loading" in "SHOW VARIABLES"

  sql/mysqld.cc
    1.542 06/04/12 15:13:10 msvensson@neptunus.(none) +6 -1
    Add have_dlopen variable

  sql/mysql_priv.h
    1.381 06/04/12 15:13:10 msvensson@neptunus.(none) +1 -1
    Add have_dlopen variable

  mysql-test/t/disabled.def
    1.25 06/04/12 15:13:10 msvensson@neptunus.(none) +0 -1
    Remove udf from disabled

  mysql-test/r/have_udf.require
    1.2 06/04/12 15:13:10 msvensson@neptunus.(none) +2 -1
    Use variable "have_dynamic_loading" to to determine if there is support for udf's

  mysql-test/include/have_udf.inc
    1.2 06/04/12 15:13:10 msvensson@neptunus.(none) +5 -9
    Use variable "have_dynamic_loading" to to determine if there is support for udf's

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug18564/my50-bug18564

--- 1.380/sql/mysql_priv.h	2006-03-30 15:14:51 +02:00
+++ 1.381/sql/mysql_priv.h	2006-04-12 15:13:10 +02:00
@@ -1296,7 +1296,7 @@
 #endif
 
 extern SHOW_COMP_OPTION have_isam;
-extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink;
+extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen;
 extern SHOW_COMP_OPTION have_query_cache;
 extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 extern SHOW_COMP_OPTION have_crypt;

--- 1.541/sql/mysqld.cc	2006-04-10 17:47:36 +02:00
+++ 1.542/sql/mysqld.cc	2006-04-12 15:13:10 +02:00
@@ -474,7 +474,7 @@
 
 SHOW_COMP_OPTION have_isam;
 SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache;
-SHOW_COMP_OPTION have_geometry, have_rtree_keys;
+SHOW_COMP_OPTION have_geometry, have_rtree_keys, have_dlopen;
 SHOW_COMP_OPTION have_crypt, have_compress;
 
 /* Thread specific variables */
@@ -6414,6 +6414,11 @@
   have_symlink=SHOW_OPTION_NO;
 #else
   have_symlink=SHOW_OPTION_YES;
+#endif
+#ifdef HAVE_DLOPEN
+  have_dlopen=SHOW_OPTION_YES;
+#else
+  have_dlopen=SHOW_OPTION_NO;
 #endif
 #ifdef HAVE_QUERY_CACHE
   have_query_cache=SHOW_OPTION_YES;

--- 1.24/mysql-test/t/disabled.def	2006-03-28 04:25:30 +02:00
+++ 1.25/mysql-test/t/disabled.def	2006-04-12 15:13:10 +02:00
@@ -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)

--- 1.150/sql/set_var.cc	2006-02-18 17:32:11 +01:00
+++ 1.151/sql/set_var.cc	2006-04-12 15:13:10 +02:00
@@ -810,6 +810,7 @@
   {"have_compress",	      (char*) &have_compress,		    SHOW_HAVE},
   {"have_crypt",	      (char*) &have_crypt,		    SHOW_HAVE},
   {"have_csv",	              (char*) &have_csv_db,	            SHOW_HAVE},
+  {"have_dynamic_loading",    (char*) &have_dlopen,	            SHOW_HAVE},
   {"have_example_engine",     (char*) &have_example_db,	            SHOW_HAVE},
   {"have_federated_engine",   (char*) &have_federated_db,           SHOW_HAVE},
   {"have_geometry",           (char*) &have_geometry,               SHOW_HAVE},

--- 1.1/mysql-test/include/have_udf.inc	2006-02-15 17:11:19 +01:00
+++ 1.2/mysql-test/include/have_udf.inc	2006-04-12 15:13:10 +02:00
@@ -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;

--- 1.1/mysql-test/r/have_udf.require	2006-02-15 17:11:19 +01:00
+++ 1.2/mysql-test/r/have_udf.require	2006-04-12 15:13:10 +02:00
@@ -1 +1,2 @@
-CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
+Variable_name	Value
+have_dynamic_loading	YES