bk commit into 5.0 tree (msvensson:1.2070)

[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.2070 06/03/10 10:42:42 msvensson@neptunus.(none) +2 -0
  Merge msvensson@devsrv-b:/space/magnus/bug17261/my50-bug17261
  into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835

  sql/udf_example.cc
    1.21 06/03/10 10:42:37 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/share/errmsg.txt
    1.61 06/03/10 10:42:37 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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/bug11835/my50-bug11835/RESYNC

--- 1.20/sql/udf_example.cc	2006-03-10 10:16:45 +01:00
+++ 1.21/sql/udf_example.cc	2006-03-10 10:42:37 +01:00
@@ -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 @@
 #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 @@
 
   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 */
   {

--- 1.60/sql/share/errmsg.txt	2006-02-21 23:20:42 +01:00
+++ 1.61/sql/share/errmsg.txt	2006-03-10 10:42:37 +01:00
@@ -2978,23 +2978,23 @@
 	swe "Funktionen '%-.64s' finns redan"
 ER_CANT_OPEN_LIBRARY  
-	nla "Kan shared library '%-.64s' niet openen (Errcode: %d %s)"
-	eng "Can't open shared library '%-.64s' (errno: %d %-.64s)"
-	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.64s)"
-	hun "A(z) '%-.64s' megosztott konyvtar nem hasznalhato (hibakod: %d %s)"
-	ita "Impossibile aprire la libreria condivisa '%-.64s' (errno: %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)"
+	nla "Kan shared library '%-.64s' niet openen (Errcode: %d %-.128s)"
+	eng "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.128s)"
+	hun "A(z) '%-.64s' megosztott konyvtar nem hasznalhato (hibakod: %d %-.128s)"
+	ita "Impossibile aprire la libreria condivisa '%-.64s' (errno: %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)"
 	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %-.64s)"
 	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %-.64s)"
@@ -3003,27 +3003,27 @@
 ER_CANT_FIND_DL_ENTRY  
-	dan "Kan ikke finde funktionen '%-.64s' i bibliotek"
-	nla "Kan functie '%-.64s' niet in library vinden"
-	eng "Can't find function '%-.64s' in library"
-	est "Ei leia funktsiooni '%-.64s' antud teegis"
-	ger "Kann Funktion '%-.64s' in der Library nicht finden"
-	hun "A(z) '%-.64s' fuggveny nem talalhato a konyvtarban"
-	ita "Impossibile trovare la funzione '%-.64s' nella libreria"
-	rum "Nu pot gasi functia '%-.64s' in libraria"
-	serbian "Ne mogu da pronadjem funkciju '%-.64s' u biblioteci"
-	swe "Hittar inte funktionen '%-.64s' in det dynamiska biblioteket"
+	dan "Kan ikke finde funktionen '%-.128s' i bibliotek"
+	nla "Kan functie '%-.128s' niet in library vinden"
+	eng "Can't find function '%-.128s' in library"
+	est "Ei leia funktsiooni '%-.128s' antud teegis"
+	ger "Kann Funktion '%-.128s' in der Library nicht finden"
+	hun "A(z) '%-.128s' fuggveny nem talalhato a konyvtarban"
+	ita "Impossibile trovare la funzione '%-.128s' nella libreria"
+	rum "Nu pot gasi functia '%-.128s' in libraria"
+	serbian "Ne mogu da pronadjem funkciju '%-.128s' u biblioteci"
+	swe "Hittar inte funktionen '%-.128s' in det dynamiska biblioteket"
 ER_FUNCTION_NOT_DEFINED  
 	dan "Funktionen '%-.64s' er ikke defineret"