Commit 6219f23b authored by unknown's avatar unknown
Browse files

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

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


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
parents 53862e60 680ba0b7

client/mysqltest.c

+14 −2
Original line number Diff line number Diff line
@@ -373,8 +373,10 @@ const char *command_names[]= 
  "enable_rpl_parse",

  "disable_rpl_parse",

  "eval_result",

  /* Enable/disable that the _query_ is logged to result file */

  "enable_query_log",

  "disable_query_log",

  /* Enable/disable that the _result_ from a query is logged to result file */

  "enable_result_log",

  "disable_result_log",

  "server_start",
@@ -752,8 +754,8 @@ static int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname) 
  check_result

  ds - content to be checked

  fname - name of file to check against

  require_option - if set and check fails, the test will be aborted with the special

                   exit code "not supported test"

  require_option - if set and check fails, the test will be aborted

                   with the special exit code "not supported test"



  RETURN VALUES

   error - the function will not return
@@ -3708,7 +3710,17 @@ static void handle_error(const char *query, struct st_query *q, 
  DBUG_ENTER("handle_error");



  if (q->require_file)

  {

    /*

      The query after a "--require" failed. This is fine as long the server

      returned a valid reponse. Don't allow 2013 or 2006 to trigger an

      abort_not_supported_test

     */

    if (err_errno == CR_SERVER_LOST ||

        err_errno == CR_SERVER_GONE_ERROR)

      die("require query '%s' failed: %d: %s", query, err_errno, err_error);

    abort_not_supported_test();

  }



  if (q->abort_on_error)

    die("query '%s' failed: %d: %s", query, err_errno, err_error);

configure.in

+30 −14
Original line number Diff line number Diff line
@@ -1547,6 +1547,18 @@ else 
fi

#---END:



# dlopen, dlerror

case "$with_mysqld_ldflags " in



  *"-static "*)

    # No need to check for dlopen when mysqld is linked with

    # -all-static or -static as it won't be able to load any functions.

    # NOTE! It would be better if it was possible to test if dlopen

    # can be used, but a good way to test it couldn't be found



    ;;



  *)

    # Check for dlopen, needed for user definable functions

    # This must be checked after threads on AIX

    # We only need this for mysqld, not for the clients.
@@ -1558,6 +1570,15 @@ LIBDL=$LIBS 
    LIBS="$my_save_LIBS"

    AC_SUBST(LIBDL)



    my_save_LIBS="$LIBS"

    LIBS="$LIBS $LIBDL"

    AC_CHECK_FUNCS(dlopen dlerror)

    LIBS="$my_save_LIBS"



    ;;

esac





# System characteristics

case $SYSTEM_TYPE in

  *netware*) ;;
@@ -1925,11 +1946,6 @@ then 
fi]

)



my_save_LIBS="$LIBS"

LIBS="$LIBS $LIBDL"

AC_CHECK_FUNCS(dlopen dlerror)

LIBS="$my_save_LIBS"



# Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)

ac_save_CXXFLAGS="$CXXFLAGS"

AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,

mysql-test/include/have_udf.inc

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#

# To check if the udf_example.so is available,

# try to load one function from it.

#

#

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

mysql-test/mysql-test-run.pl

+8 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,14 @@ sub environment_setup () { 
        ($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");

  }



  # --------------------------------------------------------------------------

  # Add the path where mysqld will find udf_example.so

  # --------------------------------------------------------------------------

  $ENV{'LD_LIBRARY_PATH'}=

    "$glob_basedir/sql/.libs" .

      ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");





  # --------------------------------------------------------------------------

  # Also command lines in .opt files may contain env vars

  # --------------------------------------------------------------------------

mysql-test/r/have_udf.require

0 → 100644
+1 −0
Original line number Diff line number Diff line 
CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';