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, 16 insertions, 101 deletions

diff --git a/mysys/my_error.c b/mysys/my_error.c
index 75aa84efca0..175f8cf516b 100644
--- a/mysys/my_error.c
+++ b/mysys/my_error.c
@@ -26,12 +26,9 @@
   WARNING!
   my_error family functions have to be used according following rules:
   - if message have not parameters use my_message(ER_CODE, ER(ER_CODE), MYF(N))
-  - if message have only integer parameters, string constants (created
-  inside program) or string put (and cut if it is need) in some limited
-  length buffer before passing it as parameter then you can use
-  my_error(ER_CODE, MYF(N), ...). Never pass string get from user to
-  my_error.
-  - in all other cases use my_printf_error(ER_CODE, ER(ER_CODE), MYF(N), ...)
+  - if message registered use my_error(ER_CODE, MYF(N), ...).
+  - With some special text of errror message use:
+  my_printf_error(ER_CODE, format, MYF(N), ...)
 */
 
 const char ** NEAR my_errmsg[MAXMAPS]={0,0,0,0};
@@ -53,107 +50,22 @@ char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];
     the length value is ignored.
 */
 
-int my_error(int nr,myf MyFlags, ...)
+int my_error(int nr, myf MyFlags, ...)
 {
-  va_list	ap;
-  uint		olen, plen;
-  reg1 const char *tpos;
-  reg2 char	*endpos;
-  char		* par;
-  char		ebuff[ERRMSGSIZE+20];
-  int           prec_chars; /* output precision */
-  my_bool       prec_supplied;
+  const char *format;
+  va_list args;
+  char ebuff[ERRMSGSIZE + 20];
   DBUG_ENTER("my_error");
-  LINT_INIT(prec_chars); /* protected by prec_supplied */
 
-  va_start(ap,MyFlags);
   DBUG_PRINT("my", ("nr: %d  MyFlags: %d  errno: %d", nr, MyFlags, errno));
 
   if (nr / ERRMOD == GLOB && my_errmsg[GLOB] == 0)
     init_glob_errs();
+  format= my_errmsg[nr / ERRMOD][nr % ERRMOD];
 
-  olen=(uint) strlen(tpos=my_errmsg[nr / ERRMOD][nr % ERRMOD]);
-  endpos=ebuff;
-
-  while (*tpos)
-  {
-    if (tpos[0] != '%')
-    {
-      *endpos++= *tpos++;	/* Copy ordinary char */
-      continue;
-    }
-    if (*++tpos == '%')		/* test if %% */
-    {
-      olen--;
-    }
-    else
-    {
-      /*
-        Skip size/precision flags to be compatible with printf.
-        The only size/precision flag supported is "%.*s".
-        If "%.*u" or "%.*d" are encountered, the precision number is read
-        from the variable argument list but its value is ignored.
-      */
-      prec_supplied= 0;
-      if (*tpos== '.')
-      {
-        tpos++;
-        olen--;
-        if (*tpos == '*')
-        {
-          tpos++;
-          olen--;
-          prec_chars= va_arg(ap, int); /* get length parameter */
-          prec_supplied= 1;
-        }
-      }
-
-      if (!prec_supplied)
-      {
-        while (my_isdigit(&my_charset_latin1, *tpos) || *tpos == '.' ||
-               *tpos == '-')
-	  tpos++;
-
-        if (*tpos == 'l')				/* Skip 'l' argument */
-	  tpos++;
-      }
-
-      if (*tpos == 's')				/* String parameter */
-      {
-	par= va_arg(ap, char *);
-	plen= (uint) strlen(par);
-        if (prec_supplied && prec_chars > 0)
-          plen= min((uint)prec_chars, plen);
-	if (olen + plen < ERRMSGSIZE+2)		/* Replace if possible */
-	{
-          strmake(endpos, par, plen);
-          endpos+= plen;
-          tpos++;
-          olen+= plen-2;
-          continue;
-	}
-      }
-      else if (*tpos == 'd' || *tpos == 'u')	/* Integer parameter */
-      {
-	register int iarg;
-	iarg= va_arg(ap, int);
-	if (*tpos == 'd')
-	  plen= (uint) (int10_to_str((long) iarg, endpos, -10) - endpos);
-	else
-	  plen= (uint) (int10_to_str((long) (uint) iarg, endpos, 10) - endpos);
-	if (olen + plen < ERRMSGSIZE+2) /* Replace parameter if possible */
-	{
-	  endpos+= plen;
-	  tpos++;
-	  olen+= plen-2;
-	  continue;
-	}
-      }
-    }
-    *endpos++= '%';		/* % used as % or unknown code */
-  }
-  *endpos= '\0';			/* End of errmessage */
-  va_end(ap);
+  va_start(args,MyFlags);
+  (void) my_vsnprintf (ebuff, sizeof(ebuff), format, args);
+  va_end(args);
   DBUG_RETURN((*error_handler_hook)(nr, ebuff, MyFlags));
 }
 
@@ -172,11 +84,14 @@ int my_printf_error(uint error, const char *format, myf MyFlags, ...)
 {
   va_list args;
   char ebuff[ERRMSGSIZE+20];
+  DBUG_ENTER("my_printf_error");
+  DBUG_PRINT("my", ("nr: %d  MyFlags: %d  errno: %d  Format: %s",
+		    error, MyFlags, errno, format));
 
   va_start(args,MyFlags);
-  (void) vsprintf (ebuff,format,args);
+  (void) my_vsnprintf (ebuff, sizeof(ebuff), format, args);
   va_end(args);
-  return (*error_handler_hook)(error, ebuff, MyFlags);
+  DBUG_RETURN((*error_handler_hook)(error, ebuff, MyFlags));
 }
 
 /*