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
2025-08-01 03:47:19 +03:00 · 2006-03-20 21:35:05 +01:00
parent 53862e6060 680ba0b7d9
commit 6219f23b94
12 changed files with 312 additions and 64 deletions
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@ -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 @@ err:
  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);
--- a/configure.in
+++ b/configure.in
@ -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,
--- a/mysql-test/include/have_udf.inc
+++ b/mysql-test/include/have_udf.inc
@ -0,0 +1,12 @@
+#
+# 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
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@ -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
  # --------------------------------------------------------------------------
--- a/mysql-test/r/have_udf.require
+++ b/mysql-test/r/have_udf.require
@ -0,0 +1 @@
+CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
--- a/mysql-test/r/udf.result
+++ b/mysql-test/r/udf.result
@ -0,0 +1,87 @@
+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
+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';
+CREATE FUNCTION reverse_lookup
+RETURNS STRING SONAME 'udf_example.so';
+CREATE AGGREGATE FUNCTION avgcost
+RETURNS REAL SONAME 'udf_example.so';
+select myfunc_double();
+ERROR HY000: myfunc_double must have at least one argument
+select myfunc_double(1);
+myfunc_double(1)
+49.00
+select myfunc_double(78654);
+myfunc_double(78654)
+54.00
+select myfunc_nonexist();
+ERROR 42000: FUNCTION test.myfunc_nonexist does not exist
+select myfunc_int();
+myfunc_int()
+0
+select lookup();
+ERROR HY000: Wrong arguments to lookup;  Use the source
+select lookup("127.0.0.1");
+lookup("127.0.0.1")
+127.0.0.1
+select lookup(127,0,0,1);
+ERROR HY000: Wrong arguments to lookup;  Use the source
+select lookup("localhost");
+lookup("localhost")
+127.0.0.1
+select reverse_lookup();
+ERROR HY000: Wrong number of arguments to reverse_lookup;  Use the source
+select reverse_lookup("127.0.0.1");
+select reverse_lookup(127,0,0,1);
+select reverse_lookup("localhost");
+reverse_lookup("localhost")
+NULL
+select avgcost();
+ERROR HY000: wrong number of arguments: AVGCOST() requires two arguments
+select avgcost(100,23.76);
+ERROR HY000: wrong argument type: AVGCOST() requires an INT and a REAL
+create table t1(sum int, price float(24));
+insert into t1 values(100, 50.00), (100, 100.00);
+select avgcost(sum, price) from t1;
+avgcost(sum, price)
+75.0000
+delete from t1;
+insert into t1 values(100, 54.33), (200, 199.99);
+select avgcost(sum, price) from t1;
+avgcost(sum, price)
+151.4367
+drop table t1;
+select metaphon('hello');
+metaphon('hello')
+HL
+CREATE PROCEDURE `XXX1`(in testval varchar(10))
+begin
+select metaphon(testval);
+end//
+call XXX1('hello');
+metaphon(testval)
+HL
+drop procedure xxx1;
+CREATE PROCEDURE `XXX2`()
+begin
+declare testval varchar(10);
+set testval = 'hello';
+select metaphon(testval);
+end//
+call XXX2();
+metaphon(testval)
+HL
+drop procedure xxx2;
+DROP FUNCTION metaphon;
+DROP FUNCTION myfunc_double;
+DROP FUNCTION myfunc_nonexist;
+ERROR 42000: FUNCTION test.myfunc_nonexist does not exist
+DROP FUNCTION myfunc_int;
+DROP FUNCTION sequence;
+DROP FUNCTION lookup;
+DROP FUNCTION reverse_lookup;
+DROP FUNCTION avgcost;
--- a/mysql-test/t/udf.test
+++ b/mysql-test/t/udf.test
@ -0,0 +1,108 @@
+--source include/have_udf.inc
+#
+# To run this tests the "sql/udf_example.cc" need to be compiled into
+# udf_example.so and LD_LIBRARY_PATH should be setup to point out where
+# the library are.
+#
+
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+#
+# Create the example functions from udf_example
+#
+
+CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';
+CREATE FUNCTION myfunc_double RETURNS REAL SONAME 'udf_example.so';
+
+--error ER_CANT_FIND_DL_ENTRY
+CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME 'udf_example.so';
+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';
+CREATE FUNCTION reverse_lookup
+        RETURNS STRING SONAME 'udf_example.so';
+CREATE AGGREGATE FUNCTION avgcost
+        RETURNS REAL SONAME 'udf_example.so';
+
+--error 0
+select myfunc_double();
+select myfunc_double(1);
+select myfunc_double(78654);
+--error 1305
+select myfunc_nonexist();
+select myfunc_int();
+--error 0
+select lookup();
+select lookup("127.0.0.1");
+--error 0
+select lookup(127,0,0,1);
+select lookup("localhost");
+--error 0
+select reverse_lookup();
+
+# These two functions should return "localhost", but it's
+# depending on configuration, so just call them and don't log the result
+--disable_result_log
+select reverse_lookup("127.0.0.1");
+select reverse_lookup(127,0,0,1);
+--enable_result_log
+
+select reverse_lookup("localhost");
+--error 0
+select avgcost();
+--error 0
+select avgcost(100,23.76);
+create table t1(sum int, price float(24));
+insert into t1 values(100, 50.00), (100, 100.00);
+select avgcost(sum, price) from t1;
+delete from t1;
+insert into t1 values(100, 54.33), (200, 199.99);
+select avgcost(sum, price) from t1;
+drop table t1;
+
+#------------------------------------------------------------------------
+# BUG#17261 Passing a variable from a stored procedure to UDF crashes mysqld
+#------------------------------------------------------------------------
+
+select metaphon('hello');
+
+delimiter //;
+CREATE PROCEDURE `XXX1`(in testval varchar(10))
+begin
+select metaphon(testval);
+end//
+delimiter ;//
+
+call XXX1('hello');
+drop procedure xxx1;
+
+delimiter //;
+CREATE PROCEDURE `XXX2`()
+begin
+declare testval varchar(10);
+set testval = 'hello';
+select metaphon(testval);
+end//
+delimiter ;//
+
+call XXX2();
+drop procedure xxx2;
+
+
+#
+# Drop the example functions from udf_example
+#
+
+DROP FUNCTION metaphon;
+DROP FUNCTION myfunc_double;
+--error ER_SP_DOES_NOT_EXIST
+DROP FUNCTION myfunc_nonexist;
+DROP FUNCTION myfunc_int;
+DROP FUNCTION sequence;
+DROP FUNCTION lookup;
+DROP FUNCTION reverse_lookup;
+DROP FUNCTION avgcost;
+
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@ -153,10 +153,11 @@ sql_yacc.o:	sql_yacc.cc sql_yacc.h $(HEADERS)
 lex_hash.h:	gen_lex_hash$(EXEEXT)
 		./gen_lex_hash$(EXEEXT) > $@

-# For testing of udf_example.so;  Works on platforms with gcc
-# (This is not part of our build process but only provided as an example)
-udf_example.so:	udf_example.cc
-		$(CXXCOMPILE) -shared -o $@ $<
+# For testing of udf_example.so
+noinst_LTLIBRARIES= udf_example.la
+udf_example_la_SOURCES= udf_example.cc
+udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
+

 # Don't update the files from bitkeeper
 %::SCCS/s.%
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@ -2606,7 +2606,7 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func,
      switch(arguments[i]->type()) {
      case Item::STRING_ITEM:			// Constant string !
      {
-	String *res=arguments[i]->val_str((String *) 0);
+	String *res=arguments[i]->val_str(&buffers[i]);
 	if (arguments[i]->null_value)
 	  continue;
 	f_args.args[i]=    (char*) res->ptr();
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@ -2978,23 +2978,23 @@ ER_UDF_EXISTS
 	swe "Funktionen '%-.64s' finns redan"
 	ukr "<22><><EFBFBD><EFBFBD>æ<EFBFBD> '%-.64s' <20><><EFBFBD> <20><><EFBFBD>դ"
 ER_CANT_OPEN_LIBRARY  
-	cze "Nemohu otev-B<><42>t sd<73>lenou knihovnu '%-.64s' (errno: %d %s)"
-	dan "Kan ikke <20>bne delt bibliotek '%-.64s' (errno: %d %s)"
-	nla "Kan shared library '%-.64s' niet openen (Errcode: %d %s)"
-	eng "Can't open shared library '%-.64s' (errno: %d %-.64s)"
-	jps "shared library '%-.64s' <20><><EFBFBD>J<EFBFBD><4A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD> (errno: %d %s)",
-	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.64s)"
-	fre "Impossible d'ouvrir la biblioth<74>que partag<61>e '%-.64s' (errno: %d %s)"
-	ger "Kann Shared Library '%-.64s' nicht <20>ffnen (Fehler: %d %-.64s)"
-	greek "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> shared library '%-.64s' (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d %s)"
-	hun "A(z) '%-.64s' megosztott konyvtar nem hasznalhato (hibakod: %d %s)"
-	ita "Impossibile aprire la libreria condivisa '%-.64s' (errno: %d %s)"
-	jpn "shared library '%-.64s' <20>򳫤<EFBFBD><F2B3ABA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD> (errno: %d %s)"
-	kor "'%-.64s' <20><><EFBFBD><EFBFBD> <20><><EFBFBD>̹<EFBFBD><CCB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȣ: %d %s)"
-	nor "Can't open shared library '%-.64s' (errno: %d %s)"
-	norwegian-ny "Can't open shared library '%-.64s' (errno: %d %s)"
-	pol "Can't open shared library '%-.64s' (errno: %d %s)"
-	por "N<>o pode abrir biblioteca compartilhada '%-.64s' (erro no. '%d' - '%-.64s')"
+	cze "Nemohu otev-B<><42>t sd<73>lenou knihovnu '%-.64s' (errno: %d %-.128s)"
+	dan "Kan ikke <20>bne delt bibliotek '%-.64s' (errno: %d %-.128s)"
+	nla "Kan shared library '%-.64s' niet openen (Errcode: %d %-.128s)"
+	eng "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	jps "shared library '%-.64s' <20><><EFBFBD>J<EFBFBD><4A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD> (errno: %d %-.128s)",
+	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.128s)"
+	fre "Impossible d'ouvrir la biblioth<74>que partag<61>e '%-.64s' (errno: %d %-.128s)"
+	ger "Kann Shared Library '%-.64s' nicht <20>ffnen (Fehler: %d %-.128s)"
+	greek "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> shared library '%-.64s' (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d %-.128s)"
+	hun "A(z) '%-.64s' megosztott konyvtar nem hasznalhato (hibakod: %d %-.128s)"
+	ita "Impossibile aprire la libreria condivisa '%-.64s' (errno: %d %-.128s)"
+	jpn "shared library '%-.64s' <20>򳫤<EFBFBD><F2B3ABA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD> (errno: %d %-.128s)"
+	kor "'%-.64s' <20><><EFBFBD><EFBFBD> <20><><EFBFBD>̹<EFBFBD><CCB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȣ: %d %-.128s)"
+	nor "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	norwegian-ny "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	pol "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	por "N<>o pode abrir biblioteca compartilhada '%-.64s' (erro no. '%d' - '%-.128s')"
 	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %-.64s)"
 	rus "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d %-.64s)"
 	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %-.64s)"
@ -3003,27 +3003,27 @@ ER_CANT_OPEN_LIBRARY
 	swe "Kan inte <20>ppna det dynamiska biblioteket '%-.64s' (Felkod: %d %s)"
 	ukr "<22><> <20><><EFBFBD><EFBFBD> צ<><D7A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>Ħ<EFBFBD><C4A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ¦<>̦<EFBFBD><CCA6><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d %-.64s)"
 ER_CANT_FIND_DL_ENTRY  
-	cze "Nemohu naj-B<>t funkci '%-.64s' v knihovn<76>"
-	dan "Kan ikke finde funktionen '%-.64s' i bibliotek"
-	nla "Kan functie '%-.64s' niet in library vinden"
-	eng "Can't find function '%-.64s' in library"
-	jps "function '%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>Ɍ<EFBFBD><C98C>t<EFBFBD><74><EFBFBD>鎖<EFBFBD><E98E96><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>",
-	est "Ei leia funktsiooni '%-.64s' antud teegis"
-	fre "Impossible de trouver la fonction '%-.64s' dans la biblioth<74>que"
-	ger "Kann Funktion '%-.64s' in der Library nicht finden"
-	greek "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	hun "A(z) '%-.64s' fuggveny nem talalhato a konyvtarban"
-	ita "Impossibile trovare la funzione '%-.64s' nella libreria"
-	jpn "function '%-.64s' <20><><EFBFBD>饤<EFBFBD>֥<EFBFBD><D6A5>꡼<EFBFBD><EAA1BC><EFBFBD>˸<EFBFBD><CBB8>դ<EFBFBD><D5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
-	kor "<22><><EFBFBD>̹<EFBFBD><CCB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20>Լ<EFBFBD><D4BC><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>."
-	por "N<>o pode encontrar a fun<75><6E>o '%-.64s' na biblioteca"
-	rum "Nu pot gasi functia '%-.64s' in libraria"
-	rus "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	serbian "Ne mogu da pronadjem funkciju '%-.64s' u biblioteci"
-	slo "Nem<65><6D>em n<>js<6A> funkciu '%-.64s' v kni<6E>nici"
-	spa "No puedo encontrar funci<63>n '%-.64s' en libraria"
-	swe "Hittar inte funktionen '%-.64s' in det dynamiska biblioteket"
-	ukr "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>æ<EFBFBD> '%-.64s' <20> ¦<>̦<EFBFBD><CCA6><EFBFBD>æ"
+	cze "Nemohu naj-B<>t funkci '%-.128s' v knihovn<76>"
+	dan "Kan ikke finde funktionen '%-.128s' i bibliotek"
+	nla "Kan functie '%-.128s' niet in library vinden"
+	eng "Can't find function '%-.128s' in library"
+	jps "function '%-.128s' <20><><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>Ɍ<EFBFBD><C98C>t<EFBFBD><74><EFBFBD>鎖<EFBFBD><E98E96><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>",
+	est "Ei leia funktsiooni '%-.128s' antud teegis"
+	fre "Impossible de trouver la fonction '%-.128s' dans la biblioth<74>que"
+	ger "Kann Funktion '%-.128s' in der Library nicht finden"
+	greek "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.128s' <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+	hun "A(z) '%-.128s' fuggveny nem talalhato a konyvtarban"
+	ita "Impossibile trovare la funzione '%-.128s' nella libreria"
+	jpn "function '%-.128s' <20><><EFBFBD>饤<EFBFBD>֥<EFBFBD><D6A5>꡼<EFBFBD><EAA1BC><EFBFBD>˸<EFBFBD><CBB8>դ<EFBFBD><D5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+	kor "<22><><EFBFBD>̹<EFBFBD><CCB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.128s' <20>Լ<EFBFBD><D4BC><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>."
+	por "N<>o pode encontrar a fun<75><6E>o '%-.128s' na biblioteca"
+	rum "Nu pot gasi functia '%-.128s' in libraria"
+	rus "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.128s' <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+	serbian "Ne mogu da pronadjem funkciju '%-.128s' u biblioteci"
+	slo "Nem<65><6D>em n<>js<6A> funkciu '%-.128s' v kni<6E>nici"
+	spa "No puedo encontrar funci<63>n '%-.128s' en libraria"
+	swe "Hittar inte funktionen '%-.128s' in det dynamiska biblioteket"
+	ukr "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>æ<EFBFBD> '%-.128s' <20> ¦<>̦<EFBFBD><CCA6><EFBFBD>æ"
 ER_FUNCTION_NOT_DEFINED  
 	cze "Funkce '%-.64s' nen-B<> definov<6F>na"
 	dan "Funktionen '%-.64s' er ikke defineret"
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@ -439,6 +439,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
  }
  if (!(dl = find_udf_dl(udf->dl)))
  {
+    DBUG_PRINT("info", ("Calling dlopen, udf->dl: %s", udf->dl));
    if (!(dl = dlopen(udf->dl, RTLD_NOW)))
    {
      DBUG_PRINT("error",("dlopen of %s failed, error: %d (%s)",
--- a/sql/udf_example.cc
+++ b/sql/udf_example.cc
@ -113,6 +113,8 @@
 */

 #ifdef STANDARD
+/* STANDARD is defined, don't use any mysql functions */
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #ifdef __WIN__
@ -125,10 +127,10 @@ typedef long long longlong;
 #else
 #include <my_global.h>
 #include <my_sys.h>
+#include <m_string.h>		// To get strmov()
 #endif
 #include <mysql.h>
-#include <m_ctype.h>
-#include <m_string.h>		// To get strmov()
+#include <ctype.h>

 static pthread_mutex_t LOCK_hostname;

@ -290,8 +292,8 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result,

  for (n = ntrans + 1, n_end = ntrans + sizeof(ntrans)-2;
 	word != w_end && n < n_end; word++ )
-    if ( my_isalpha ( &my_charset_latin1, *word ))
-      *n++ = my_toupper ( &my_charset_latin1, *word );
+    if ( isalpha ( *word ))
+      *n++ = toupper ( *word );

  if ( n == ntrans + 1 )	/* return empty string if 0 bytes */
  {
@ -519,7 +521,7 @@ my_bool myfunc_double_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
 {
  if (!args->arg_count)
  {
-    strcpy(message,"myfunc_double must have at least on argument");
+    strcpy(message,"myfunc_double must have at least one argument");
    return 1;
  }
  /*
				`@ -0,0 +1 @@`
				`CREATE FUNCTION metaphon RETURNS STRING SONAME 'udf_example.so';`