merge

include/mysqld_error.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/rpl_charset.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_uniq.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/repl_failsafe.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

1 files changed, 24 insertions, 15 deletions

diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index c3043ed2c73..91b29ce9b61 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -350,7 +350,8 @@ sql_parse_prepare(const LEX_STRING *file_name, MEM_ROOT *mem_root,
 
   if (stat_info.st_size > INT_MAX-1)
   {
-    my_error(ER_FPARSER_TOO_BIG_FILE, MYF(0), file_name->str);
+    my_printf_error(ER_FPARSER_TOO_BIG_FILE,
+                    ER(ER_FPARSER_TOO_BIG_FILE), MYF(0), file_name->str);
     DBUG_RETURN(0);
   }
 
@@ -412,7 +413,8 @@ sql_parse_prepare(const LEX_STRING *file_name, MEM_ROOT *mem_root,
 frm_error:
   if (bad_format_errors)
   {
-    my_error(ER_FPARSER_BAD_HEADER, MYF(0), file_name->str);
+    my_printf_error(ER_FPARSER_BAD_HEADER, ER(ER_FPARSER_BAD_HEADER), MYF(0),
+                    file_name->str);
     DBUG_RETURN(0);
   }
   else
@@ -625,7 +627,8 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
       // it is comment
       if (!(ptr= strchr(ptr, '\n')))
       {
-	my_error(ER_FPARSER_EOF_IN_COMMENT, MYF(0), line);
+	my_printf_error(ER_FPARSER_EOF_IN_COMMENT,
+                        ER(ER_FPARSER_EOF_IN_COMMENT), MYF(0), line);
 	DBUG_RETURN(TRUE);
       }
       ptr++;
@@ -667,8 +670,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
 				  (LEX_STRING *)(base +
 						 parameter->offset))))
 	  {
-	    my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
-		     parameter->name.str, line);
+	    my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER,
+                            ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0),
+                            parameter->name.str, line);
 	    DBUG_RETURN(TRUE);
 	  }
 	  break;
@@ -679,8 +683,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
 					  (LEX_STRING *)
 					  (base + parameter->offset))))
 	  {
-	    my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
-		     parameter->name.str, line);
+	    my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER,
+                            ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0),
+                            parameter->name.str, line);
 	    DBUG_RETURN(TRUE);
 	  }
 	  break;
@@ -689,8 +694,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
 	case FILE_OPTIONS_REV:
 	  if (!(eol= strchr(ptr, '\n')))
 	  {
-	    my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
-		     parameter->name.str, line);
+	    my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER,
+                            ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0),
+                            parameter->name.str, line);
 	    DBUG_RETURN(TRUE);
 	  }
           {
@@ -707,8 +713,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
 	  /* yyyy-mm-dd HH:MM:SS = 19(PARSE_FILE_TIMESTAMPLENGTH) characters */
 	  if (ptr[PARSE_FILE_TIMESTAMPLENGTH] != '\n')
 	  {
-	    my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
-		     parameter->name.str, line);
+	    my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER,
+                            ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0),
+                            parameter->name.str, line);
 	    DBUG_RETURN(TRUE);
 	  }
 	  memcpy(val->str, ptr, PARSE_FILE_TIMESTAMPLENGTH);
@@ -747,8 +754,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
 	  break;
 
       list_err_w_message:
-	  my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
-		     parameter->name.str, line);
+	  my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER,
+                          ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0),
+                          parameter->name.str, line);
       list_err:
 	  DBUG_RETURN(TRUE);
 	}
@@ -761,8 +769,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
 	// skip unknown parameter
 	if (!(ptr= strchr(ptr, '\n')))
 	{
-	  my_error(ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER, MYF(0),
-		   line);
+	  my_printf_error(ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER,
+                          ER(ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER), MYF(0),
+                          line);
 	  DBUG_RETURN(TRUE);
 	}
 	ptr++;