bk commit into 5.0 tree (msvensson:1.2069)

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

  sql/udf_example.cc
    1.20 06/03/10 10:16:45 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.19/sql/udf_example.cc	2006-02-09 13:00:28 +01:00
+++ 1.20/sql/udf_example.cc	2006-03-10 10:16:45 +01:00
@@ -519,7 +519,7 @@
 {
   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;
   }
   /*