now my_printf_error is not better then my_error, but my_error call is shorter

used only one implementation of format parser of (printf)
fixed multistatement


include/mysqld_error.h:
  newerror messages
mysql-test/t/key.test:
  unknown error replaced with real error
mysys/my_error.c:
  my_error & my_printf_error use my_vsprintf
sql/field_conv.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/ha_innodb.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/handler.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/item.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/item_cmpfunc.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/item_func.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/item_strfunc.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/lock.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/log.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/parse_file.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/procedure.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/protocol.cc:
  no need reset thd->lex->found_colon to break multiline sequance now, send_error called too late
sql/repl_failsafe.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/set_var.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/share/czech/errmsg.txt:
  new errors converted from unknown error
sql/share/danish/errmsg.txt:
  new errors converted from unknown error
sql/share/dutch/errmsg.txt:
  new errors converted from unknown error
sql/share/english/errmsg.txt:
  new errors converted from unknown error
sql/share/estonian/errmsg.txt:
  new errors converted from unknown error
sql/share/french/errmsg.txt:
  new errors converted from unknown error
sql/share/german/errmsg.txt:
  new errors converted from unknown error
sql/share/greek/errmsg.txt:
  new errors converted from unknown error
sql/share/hungarian/errmsg.txt:
  new errors converted from unknown error
sql/share/italian/errmsg.txt:
  new errors converted from unknown error
sql/share/japanese/errmsg.txt:
  new errors converted from unknown error
sql/share/korean/errmsg.txt:
  new errors converted from unknown error
sql/share/norwegian-ny/errmsg.txt:
  new errors converted from unknown error
sql/share/norwegian/errmsg.txt:
  new errors converted from unknown error
sql/share/polish/errmsg.txt:
  new errors converted from unknown error
sql/share/portuguese/errmsg.txt:
  new errors converted from unknown error
sql/share/romanian/errmsg.txt:
  new errors converted from unknown error
sql/share/russian/errmsg.txt:
  new errors converted from unknown error
sql/share/serbian/errmsg.txt:
  new errors converted from unknown error
sql/share/slovak/errmsg.txt:
  new errors converted from unknown error
sql/share/spanish/errmsg.txt:
  new errors converted from unknown error
sql/share/swedish/errmsg.txt:
  new errors converted from unknown error
sql/share/ukrainian/errmsg.txt:
  new errors converted from unknown error
sql/slave.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sp.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sp_head.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_acl.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_analyse.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_base.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_class.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_db.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_delete.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_handler.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_insert.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_load.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_map.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_parse.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
  multi-row command fixed
sql/sql_prepare.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
  remover send_error ingected from 4.1
sql/sql_rename.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_repl.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_select.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_show.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_table.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_trigger.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_udf.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_update.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_view.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/sql_yacc.yy:
  now my_printf_error is not better then my_error, but my_error call is shorter
sql/table.cc:
  now my_printf_error is not better then my_error, but my_error call is shorter
strings/my_vsnprintf.c:
  * format support added to my_vsprint

1 files changed, 14 insertions, 24 deletions

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