Merge msvensson@devsrv-b:/space/magnus/bug17261/my50-bug17261

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


sql/share/errmsg.txt:
  Auto merged
sql/udf_example.cc:
  Auto merged

4 files changed, 51 insertions, 46 deletions

diff --git a/sql/Makefile.am b/sql/Makefile.am
index d701c18a4d7..9b818f7c389 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -153,10 +153,12 @@ 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_CXXFLAGS= -DSTANDARD
+udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
+
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index a860796f02d..37487c245a9 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -2978,23 +2978,23 @@ ER_UDF_EXISTS
 	swe "Funktionen '%-.64s' finns redan"
 	ukr "����æ� '%-.64s' ��� ���դ"
 ER_CANT_OPEN_LIBRARY  
-	cze "Nemohu otev-B��t sd�lenou knihovnu '%-.64s' (errno: %d %s)"
-	dan "Kan ikke �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' ���J�������ł��܂��� (errno: %d %s)",
-	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.64s)"
-	fre "Impossible d'ouvrir la biblioth�que partag�e '%-.64s' (errno: %d %s)"
-	ger "Kann Shared Library '%-.64s' nicht �ffnen (Fehler: %d %-.64s)"
-	greek "��� ����� ������ � �������� ��� shared library '%-.64s' (������� ������: %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' �򳫤������Ǥ��ޤ��� (errno: %d %s)"
-	kor "'%-.64s' ���� ���̹������� ���� �����ϴ�.(������ȣ: %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��t sd�lenou knihovnu '%-.64s' (errno: %d %-.128s)"
+	dan "Kan ikke �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' ���J�������ł��܂��� (errno: %d %-.128s)",
+	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.128s)"
+	fre "Impossible d'ouvrir la biblioth�que partag�e '%-.64s' (errno: %d %-.128s)"
+	ger "Kann Shared Library '%-.64s' nicht �ffnen (Fehler: %d %-.128s)"
+	greek "��� ����� ������ � �������� ��� shared library '%-.64s' (������� ������: %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' �򳫤������Ǥ��ޤ��� (errno: %d %-.128s)"
+	kor "'%-.64s' ���� ���̹������� ���� �����ϴ�.(������ȣ: %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 "���������� ������� ������������ ���������� '%-.64s' (������: %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 �ppna det dynamiska biblioteket '%-.64s' (Felkod: %d %s)"
 	ukr "�� ���� צ������ ���Ħ������ ¦�̦����� '%-.64s' (�������: %d %-.64s)"
 ER_CANT_FIND_DL_ENTRY  
-	cze "Nemohu naj-B�t funkci '%-.64s' v knihovn�"
-	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' �����C�u�����[���Ɍ��t���鎖���ł��܂���",
-	est "Ei leia funktsiooni '%-.64s' antud teegis"
-	fre "Impossible de trouver la fonction '%-.64s' dans la biblioth�que"
-	ger "Kann Funktion '%-.64s' in der Library nicht finden"
-	greek "��� ����� ������ � �������� ��� ���������� '%-.64s' ���� ����������"
-	hun "A(z) '%-.64s' fuggveny nem talalhato a konyvtarban"
-	ita "Impossibile trovare la funzione '%-.64s' nella libreria"
-	jpn "function '%-.64s' ��饤�֥�꡼��˸��դ�������Ǥ��ޤ���"
-	kor "���̹��������� '%-.64s' �Լ��� ã�� �� �����ϴ�."
-	por "N�o pode encontrar a fun��o '%-.64s' na biblioteca"
-	rum "Nu pot gasi functia '%-.64s' in libraria"
-	rus "���������� �������� ������� '%-.64s' � ����������"
-	serbian "Ne mogu da pronadjem funkciju '%-.64s' u biblioteci"
-	slo "Nem��em n�js� funkciu '%-.64s' v kni�nici"
-	spa "No puedo encontrar funci�n '%-.64s' en libraria"
-	swe "Hittar inte funktionen '%-.64s' in det dynamiska biblioteket"
-	ukr "�� ���� ������ ����æ� '%-.64s' � ¦�̦���æ"
+	cze "Nemohu naj-B�t funkci '%-.128s' v knihovn�"
+	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' �����C�u�����[���Ɍ��t���鎖���ł��܂���",
+	est "Ei leia funktsiooni '%-.128s' antud teegis"
+	fre "Impossible de trouver la fonction '%-.128s' dans la biblioth�que"
+	ger "Kann Funktion '%-.128s' in der Library nicht finden"
+	greek "��� ����� ������ � �������� ��� ���������� '%-.128s' ���� ����������"
+	hun "A(z) '%-.128s' fuggveny nem talalhato a konyvtarban"
+	ita "Impossibile trovare la funzione '%-.128s' nella libreria"
+	jpn "function '%-.128s' ��饤�֥�꡼��˸��դ�������Ǥ��ޤ���"
+	kor "���̹��������� '%-.128s' �Լ��� ã�� �� �����ϴ�."
+	por "N�o pode encontrar a fun��o '%-.128s' na biblioteca"
+	rum "Nu pot gasi functia '%-.128s' in libraria"
+	rus "���������� �������� ������� '%-.128s' � ����������"
+	serbian "Ne mogu da pronadjem funkciju '%-.128s' u biblioteci"
+	slo "Nem��em n�js� funkciu '%-.128s' v kni�nici"
+	spa "No puedo encontrar funci�n '%-.128s' en libraria"
+	swe "Hittar inte funktionen '%-.128s' in det dynamiska biblioteket"
+	ukr "�� ���� ������ ����æ� '%-.128s' � ¦�̦���æ"
 ER_FUNCTION_NOT_DEFINED  
 	cze "Funkce '%-.64s' nen-B� definov�na"
 	dan "Funktionen '%-.64s' er ikke defineret"
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 40e5a9a00cf..c5badd85a6a 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -432,6 +432,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)",
diff --git a/sql/udf_example.cc b/sql/udf_example.cc
index c94af5cd6ee..e6d272d9085 100644
--- 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 */
   {