Commit f539e588 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 5c1b70be 0a8d876d

mysql-test/include/have_udf.inc

+5 −9
Original line number Diff line number Diff line 
#

# 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;

mysql-test/r/have_udf.require

+2 −1
Original line number Diff line number Diff line 
CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
 
Variable_name	Value

have_dynamic_loading	YES

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -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)

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ extern SHOW_COMP_OPTION have_ndbcluster; 
#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;

sql/mysqld.cc

+6 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ CHARSET_INFO *character_set_filesystem; 


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 */
@@ -6440,6 +6440,11 @@ static void mysql_init_variables(void) 
#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;

#else