bk commit into 5.1 tree (bar:1.2550)

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar 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.2550 07/04/12 11:31:59 bar@stripped +1 -0
  Merge mysql.com:/home/bar/mysql-5.0-rpl
  into  mysql.com:/home/bar/mysql-5.1-new-rpl

  sql/mysqld.cc
    1.630 07/04/12 11:31:54 bar@stripped +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:	bar
# Host:	bar.myoffice.izhnet.ru
# Root:	/home/bar/mysql-5.1-new-rpl/RESYNC

--- 1.629/sql/mysqld.cc	2007-04-10 21:26:09 +05:00
+++ 1.630/sql/mysqld.cc	2007-04-12 11:31:54 +05:00
@@ -2919,7 +2919,7 @@ static int init_common_variables(const c
   if (!(my_default_lc_time_names=
         my_locale_by_name(lc_time_names_name)))
   {
-    sql_print_error("Unknown locale: '%s'", MYF(0), lc_time_names_name);
+    sql_print_error("Unknown locale: '%s'", lc_time_names_name);
     return 1;
   }
   global_system_variables.lc_time_names= my_default_lc_time_names;