List:Commits« Previous MessageNext Message »
From:msvensson Date:February 22 2007 3:41pm
Subject:bk commit into 5.0 tree (msvensson:1.2414) BUG#26571
View as plain text  
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@stripped, 2007-02-22 16:41:51+01:00, msvensson@stripped +3 -0
  Bug #26571  	Different format specifiers in errmsg.txt
  - Add check of format specifiers in error message strings
  - Update error message text accordingly to be equal between all translations

  extra/Makefile.am@stripped, 2007-02-22 16:41:49+01:00, msvensson@stripped +2 -1
    comp_err uses my_cheksum, link with zlib

  extra/comp_err.c@stripped, 2007-02-22 16:41:49+01:00, msvensson@stripped +119 -0
    Add check of format specifiers in error message strings

  sql/share/errmsg.txt@stripped, 2007-02-22 16:41:49+01:00, msvensson@stripped +540 -540
    Update error messages after checks
    ---
    Remove the newly added space in error message, should not be there

# 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:	pilot.blaudden
# Root:	/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum

--- 1.37/extra/Makefile.am	2006-12-30 21:02:04 +01:00
+++ 1.38/extra/Makefile.am	2007-02-22 16:41:49 +01:00
@@ -16,7 +16,8 @@
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			@ndbcluster_includes@ -I$(top_srcdir)/sql
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
-			../dbug/libdbug.a ../strings/libmystrings.a
+			../dbug/libdbug.a ../strings/libmystrings.a \
+			$(ZLIB_LIBS)
 BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
                         $(top_builddir)/include/sql_state.h \
                         $(top_builddir)/include/mysqld_ername.h

--- 1.25/extra/comp_err.c	2006-12-23 20:04:04 +01:00
+++ 1.26/extra/comp_err.c	2007-02-22 16:41:49 +01:00
@@ -132,6 +132,8 @@
 					    char *str);
 static struct message *find_message(struct errors *err, const char *lang,
                                     my_bool no_default);
+static int check_message_format(struct errors *err,
+                                const char* mess);
 static int parse_input_file(const char *file_name, struct errors **top_error,
 			    struct languages **top_language);
 static int get_options(int *argc, char ***argv);
@@ -458,6 +460,13 @@
 		current_error->er_name, current_message.lang_short_name);
 	DBUG_RETURN(0);
       }
+      if (check_message_format(current_error, current_message.text))
+      {
+	fprintf(stderr, "Wrong formatspecifier of error message string"
+                        " for error '%s' in language '%s'\n",
+		current_error->er_name, current_message.lang_short_name);
+	DBUG_RETURN(0);
+      }
       if (insert_dynamic(&current_error->msg, (byte *) & current_message))
 	DBUG_RETURN(0);
       continue;
@@ -596,6 +605,116 @@
     }
   }
   DBUG_RETURN(no_default ? NULL : return_val);
+}
+
+
+
+/*
+  Check message format specifiers against error message for
+  previous language
+
+  SYNOPSIS
+    checksum_format_specifier()
+    msg            String for which to generate checksum
+                   for the format specifiers
+
+  RETURN VALUE
+    Returns the checksum for all the characters of the
+    format specifiers
+
+    Ex.
+     "text '%-64.s' text part 2 %d'"
+            ^^^^^^              ^^
+            characters will be xored to form checksum
+
+    NOTE:
+      Does not support format specifiers with positional args
+      like "%2$s" but that is not yet supported by my_vsnprintf
+      either.
+*/
+
+static char checksum_format_specifier(const char* msg)
+{
+  char chksum= 0;
+  const char* p= msg;
+  const char* start= 0;
+  int num_format_specifiers= 0;
+  while (*p)
+  {
+
+    if (*p == '%')
+    {
+      start= p+1; /* Entering format specifier */
+      num_format_specifiers++;
+    }
+    else if (start)
+    {
+      switch(*p)
+      {
+      case 'd':
+      case 'u':
+      case 'x':
+      case 's':
+        chksum= my_checksum(chksum, start, p-start);
+        start= 0; /* Not in format specifier anymore */
+        break;
+
+      default:
+        break;
+      }
+    }
+
+    p++;
+  }
+
+  if (start)
+  {
+    /* Still inside a format specifier after end of string */
+
+    fprintf(stderr, "Still inside formatspecifier after end of string"
+                    " in'%s'\n", msg);
+    DBUG_ASSERT(start==0);
+  }
+
+  /* Add number of format specifiers to checksum as extra safeguard */
+  chksum+= num_format_specifiers;
+
+  return chksum;
+}
+
+
+/*
+  Check message format specifiers against error message for
+  previous language
+
+  SYNOPSIS
+    check_message_format()
+    err             Error to check message for
+    mess            Message to check
+
+  RETURN VALUE
+    Returns 0 if no previous error message or message format is ok
+*/
+static int check_message_format(struct errors *err,
+                                const char* mess)
+{
+  struct message *first;
+  DBUG_ENTER("check_message_format");
+
+  /*  Get first message(if any) */
+  if ((err->msg).elements == 0)
+    DBUG_RETURN(0); /* No previous message to compare against */
+
+  first= dynamic_element(&err->msg, 0, struct message*);
+  DBUG_ASSERT(first != NULL);
+
+  if (checksum_format_specifier(first->text) !=
+      checksum_format_specifier(mess))
+  {
+    /* Check sum of format specifiers failed, they should be equal */
+    DBUG_RETURN(1);
+  }
+  DBUG_RETURN(0);
 }
 
 

--- 1.75/sql/share/errmsg.txt	2006-11-13 17:06:41 +01:00
+++ 1.76/sql/share/errmsg.txt	2007-02-22 16:41:49 +01:00
@@ -51,54 +51,54 @@
 	spa "SI"
 ER_CANT_CREATE_FILE  
-	dan "Kan ikke oprette filen '%-.64s' (Fejlkode: %d)"
-	nla "Kan file '%-.64s' niet aanmaken (Errcode: %d)"
+	dan "Kan ikke oprette filen '%-.200s' (Fejlkode: %d)"
+	nla "Kan file '%-.200s' niet aanmaken (Errcode: %d)"
 	eng "Can't create file '%-.200s' (errno: %d)"
-	est "Ei suuda luua faili '%-.64s' (veakood: %d)"
-	ger "Kann Datei '%-.64s' nicht erzeugen (Fehler: %d)"
-	hun "A '%-.64s' file nem hozhato letre (hibakod: %d)"
-	ita "Impossibile creare il file '%-.64s' (errno: %d)"
-	nor "Kan ikke opprette fila '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje opprette fila '%-.64s' (Feilkode: %d)"
-	rum "Nu pot sa creez fisierul '%-.64s' (Eroare: %d)"
-	serbian "Ne mogu da kreiram file '%-.64s' (errno: %d)"
-	spa "No puedo crear archivo '%-.64s' (Error: %d)"
-	swe "Kan inte skapa filen '%-.64s' (Felkod: %d)"
+	est "Ei suuda luua faili '%-.200s' (veakood: %d)"
+	ger "Kann Datei '%-.200s' nicht erzeugen (Fehler: %d)"
+	hun "A '%-.200s' file nem hozhato letre (hibakod: %d)"
+	ita "Impossibile creare il file '%-.200s' (errno: %d)"
+	nor "Kan ikke opprette fila '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje opprette fila '%-.200s' (Feilkode: %d)"
+	rum "Nu pot sa creez fisierul '%-.200s' (Eroare: %d)"
+	serbian "Ne mogu da kreiram file '%-.200s' (errno: %d)"
+	spa "No puedo crear archivo '%-.200s' (Error: %d)"
+	swe "Kan inte skapa filen '%-.200s' (Felkod: %d)"
 ER_CANT_CREATE_TABLE  
-	dan "Kan ikke oprette tabellen '%-.64s' (Fejlkode: %d)"
-	nla "Kan tabel '%-.64s' niet aanmaken (Errcode: %d)"
+	dan "Kan ikke oprette tabellen '%-.200s' (Fejlkode: %d)"
+	nla "Kan tabel '%-.200s' niet aanmaken (Errcode: %d)"
 	eng "Can't create table '%-.200s' (errno: %d)"
-	est "Ei suuda luua tabelit '%-.64s' (veakood: %d)"
-	ger "Kann Tabelle '%-.64s' nicht erzeugen (Fehler: %d)"
-	hun "A '%-.64s' tabla nem hozhato letre (hibakod: %d)"
-	ita "Impossibile creare la tabella '%-.64s' (errno: %d)"
-	nor "Kan ikke opprette tabellen '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje opprette tabellen '%-.64s' (Feilkode: %d)"
-	rum "Nu pot sa creez tabla '%-.64s' (Eroare: %d)"
-	serbian "Ne mogu da kreiram tabelu '%-.64s' (errno: %d)"
-	spa "No puedo crear tabla '%-.64s' (Error: %d)"
-	swe "Kan inte skapa tabellen '%-.64s' (Felkod: %d)"
+	est "Ei suuda luua tabelit '%-.200s' (veakood: %d)"
+	ger "Kann Tabelle '%-.200s' nicht erzeugen (Fehler: %d)"
+	hun "A '%-.200s' tabla nem hozhato letre (hibakod: %d)"
+	ita "Impossibile creare la tabella '%-.200s' (errno: %d)"
+	nor "Kan ikke opprette tabellen '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje opprette tabellen '%-.200s' (Feilkode: %d)"
+	rum "Nu pot sa creez tabla '%-.200s' (Eroare: %d)"
+	serbian "Ne mogu da kreiram tabelu '%-.200s' (errno: %d)"
+	spa "No puedo crear tabla '%-.200s' (Error: %d)"
+	swe "Kan inte skapa tabellen '%-.200s' (Felkod: %d)"
 ER_CANT_CREATE_DB  
 	dan "Kan ikke oprette databasen '%-.64s' (Fejlkode: %d)"
@@ -275,30 +275,30 @@
 	swe "Hittar inte posten i systemregistret"
 ER_CANT_GET_STAT  
-	nla "Kan de status niet krijgen van '%-.64s' (Errcode: %d)"
+	nla "Kan de status niet krijgen van '%-.200s' (Errcode: %d)"
 	eng "Can't get status of '%-.200s' (errno: %d)"
-	est "Ei suuda lugeda '%-.64s' olekut (veakood: %d)"
-	fre "Ne peut obtenir le status de '%-.64s' (Errcode: %d)"
-	ger "Kann Status von '%-.64s' nicht ermitteln (Fehler: %d)"
-	hun "A(z) '%-.64s' statusza nem allapithato meg (hibakod: %d)"
-	ita "Impossibile leggere lo stato di '%-.64s' (errno: %d)"
-	nor "Kan ikke lese statusen til '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje lese statusen til '%-.64s' (Feilkode: %d)"
-	rum "Nu pot sa obtin statusul lui '%-.64s' (Eroare: %d)"
-	serbian "Ne mogu da dobijem stanje file-a '%-.64s' (errno: %d)"
-	spa "No puedo obtener el estado de '%-.64s' (Error: %d)"
+	est "Ei suuda lugeda '%-.200s' olekut (veakood: %d)"
+	fre "Ne peut obtenir le status de '%-.200s' (Errcode: %d)"
+	ger "Kann Status von '%-.200s' nicht ermitteln (Fehler: %d)"
+	hun "A(z) '%-.200s' statusza nem allapithato meg (hibakod: %d)"
+	ita "Impossibile leggere lo stato di '%-.200s' (errno: %d)"
+	nor "Kan ikke lese statusen til '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje lese statusen til '%-.200s' (Feilkode: %d)"
+	rum "Nu pot sa obtin statusul lui '%-.200s' (Eroare: %d)"
+	serbian "Ne mogu da dobijem stanje file-a '%-.200s' (errno: %d)"
+	spa "No puedo obtener el estado de '%-.200s' (Error: %d)"
 ER_CANT_GET_WD  
@@ -350,55 +350,55 @@
 ER_CANT_OPEN_FILE  
-	nla "Kan de file '%-.64s' niet openen (Errcode: %d)"
+	nla "Kan de file '%-.200s' niet openen (Errcode: %d)"
 	eng "Can't open file: '%-.200s' (errno: %d)"
-	est "Ei suuda avada faili '%-.64s' (veakood: %d)"
-	fre "Ne peut ouvrir le fichier: '%-.64s' (Errcode: %d)"
-	hun "A '%-.64s' file nem nyithato meg (hibakod: %d)"
-	ita "Impossibile aprire il file: '%-.64s' (errno: %d)"
-	rum "Nu pot sa deschid fisierul: '%-.64s' (Eroare: %d)"
-	serbian "Ne mogu da otvorim file: '%-.64s' (errno: %d)"
-	spa "No puedo abrir archivo: '%-.64s' (Error: %d)"
+	est "Ei suuda avada faili '%-.200s' (veakood: %d)"
+	fre "Ne peut ouvrir le fichier: '%-.200s' (Errcode: %d)"
+	hun "A '%-.200s' file nem nyithato meg (hibakod: %d)"
+	ita "Impossibile aprire il file: '%-.200s' (errno: %d)"
+	rum "Nu pot sa deschid fisierul: '%-.200s' (Eroare: %d)"
+	serbian "Ne mogu da otvorim file: '%-.200s' (errno: %d)"
+	spa "No puedo abrir archivo: '%-.200s' (Error: %d)"
 ER_FILE_NOT_FOUND  
-	dan "Kan ikke finde fila: '%-.64s' (Fejlkode: %d)"
-	nla "Kan de file: '%-.64s' niet vinden (Errcode: %d)"
+	dan "Kan ikke finde fila: '%-.200s' (Fejlkode: %d)"
+	nla "Kan de file: '%-.200s' niet vinden (Errcode: %d)"
 	eng "Can't find file: '%-.200s' (errno: %d)"
-	est "Ei suuda leida faili '%-.64s' (veakood: %d)"
-	fre "Ne peut trouver le fichier: '%-.64s' (Errcode: %d)"
-	ger "Kann Datei '%-.64s' nicht finden (Fehler: %d)"
-	hun "A(z) '%-.64s' file nem talalhato (hibakod: %d)"
-	ita "Impossibile trovare il file: '%-.64s' (errno: %d)"
-	nor "Kan ikke finne fila: '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Kan ikkje finne fila: '%-.64s' (Feilkode: %d)"
-	rum "Nu pot sa gasesc fisierul: '%-.64s' (Eroare: %d)"
-	spa "No puedo encontrar archivo: '%-.64s' (Error: %d)"
-	swe "Hittar inte filen '%-.64s' (Felkod: %d)"
+	est "Ei suuda leida faili '%-.200s' (veakood: %d)"
+	fre "Ne peut trouver le fichier: '%-.200s' (Errcode: %d)"
+	ger "Kann Datei '%-.200s' nicht finden (Fehler: %d)"
+	hun "A(z) '%-.200s' file nem talalhato (hibakod: %d)"
+	ita "Impossibile trovare il file: '%-.200s' (errno: %d)"
+	nor "Kan ikke finne fila: '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Kan ikkje finne fila: '%-.200s' (Feilkode: %d)"
+	rum "Nu pot sa gasesc fisierul: '%-.200s' (Eroare: %d)"
+	spa "No puedo encontrar archivo: '%-.200s' (Error: %d)"
+	swe "Hittar inte filen '%-.200s' (Felkod: %d)"
 ER_CANT_READ_DIR  
@@ -480,7 +480,7 @@
-	ger "Festplatte voll (%-.64s). Warte, bis jemand Platz schafft ..."
+	ger "Festplatte voll (%s). Warte, bis jemand Platz schafft ..."
 	hun "A lemez megtelt (%s)."
 	ita "Disco pieno (%s). In attesa che qualcuno liberi un po' di spazio..."
@@ -546,80 +546,80 @@
 ER_ERROR_ON_READ  
-	nla "Fout bij het lezen van file '%-.64s' (Errcode: %d)"
+	nla "Fout bij het lezen van file '%-.200s' (Errcode: %d)"
 	eng "Error reading file '%-.200s' (errno: %d)"
-	est "Viga faili '%-.64s' lugemisel (veakood: %d)"
-	fre "Erreur en lecture du fichier '%-.64s' (Errcode: %d)"
-	ger "Fehler beim Lesen der Datei '%-.64s' (Fehler: %d)"
-	hun "Hiba a '%-.64s'file olvasasakor. (hibakod: %d)"
-	ita "Errore durante la lettura del file '%-.64s' (errno: %d)"
-	nor "Feil ved lesing av '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Feil ved lesing av '%-.64s' (Feilkode: %d)"
-	por "Erro ao ler arquivo '%-.64s' (erro no. %d)"
-	rum "Eroare citind fisierul '%-.64s' (errno: %d)"
-	spa "Error leyendo el fichero '%-.64s' (Error: %d)"
+	est "Viga faili '%-.200s' lugemisel (veakood: %d)"
+	fre "Erreur en lecture du fichier '%-.200s' (Errcode: %d)"
+	ger "Fehler beim Lesen der Datei '%-.200s' (Fehler: %d)"
+	hun "Hiba a '%-.200s'file olvasasakor. (hibakod: %d)"
+	ita "Errore durante la lettura del file '%-.200s' (errno: %d)"
+	nor "Feil ved lesing av '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Feil ved lesing av '%-.200s' (Feilkode: %d)"
+	por "Erro ao ler arquivo '%-.200s' (erro no. %d)"
+	rum "Eroare citind fisierul '%-.200s' (errno: %d)"
+	spa "Error leyendo el fichero '%-.200s' (Error: %d)"
 ER_ERROR_ON_RENAME  
-	nla "Fout bij het hernoemen van '%-.64s' naar '%-.64s' (Errcode: %d)"
+	nla "Fout bij het hernoemen van '%-.150s' naar '%-.150s' (Errcode: %d)"
 	eng "Error on rename of '%-.150s' to '%-.150s' (errno: %d)"
-	fre "Erreur en renommant '%-.64s' en '%-.64s' (Errcode: %d)"
-	ger "Fehler beim Umbenennen von '%-.64s' in '%-.64s' (Fehler: %d)"
-	hun "Hiba a '%-.64s' file atnevezesekor. (hibakod: %d)"
-	ita "Errore durante la rinominazione da '%-.64s' a '%-.64s' (errno: %d)"
-	por "Erro ao renomear '%-.64s' para '%-.64s' (erro no. %d)"
-	rum "Eroare incercind sa renumesc '%-.64s' in '%-.64s' (errno: %d)"
-	spa "Error en el renombrado de '%-.64s' a '%-.64s' (Error: %d)"
+	fre "Erreur en renommant '%-.150s' en '%-.150s' (Errcode: %d)"
+	ger "Fehler beim Umbenennen von '%-.150s' in '%-.150s' (Fehler: %d)"
+	hun "Hiba a '%-.150s' file atnevezesekor '%-.150s'. (hibakod: %d)"
+	ita "Errore durante la rinominazione da '%-.150s' a '%-.150s' (errno: %d)"
+	por "Erro ao renomear '%-.150s' para '%-.150s' (erro no. %d)"
+	rum "Eroare incercind sa renumesc '%-.150s' in '%-.150s' (errno: %d)"
+	spa "Error en el renombrado de '%-.150s' a '%-.150s' (Error: %d)"
 ER_ERROR_ON_WRITE  
-	dan "Fejl ved skriving av filen '%-.64s' (Fejlkode: %d)"
-	nla "Fout bij het wegschrijven van file '%-.64s' (Errcode: %d)"
+	dan "Fejl ved skriving av filen '%-.200s' (Fejlkode: %d)"
+	nla "Fout bij het wegschrijven van file '%-.200s' (Errcode: %d)"
 	eng "Error writing file '%-.200s' (errno: %d)"
-	est "Viga faili '%-.64s' kirjutamisel (veakood: %d)"
-	ger "Fehler beim Speichern der Datei '%-.64s' (Fehler: %d)"
-	hun "Hiba a '%-.64s' file irasakor. (hibakod: %d)"
-	ita "Errore durante la scrittura del file '%-.64s' (errno: %d)"
-	nor "Feil ved skriving av fila '%-.64s' (Feilkode: %d)"
-	norwegian-ny "Feil ved skriving av fila '%-.64s' (Feilkode: %d)"
-	por "Erro ao gravar arquivo '%-.64s' (erro no. %d)"
-	rum "Eroare scriind fisierul '%-.64s' (errno: %d)"
-	spa "Error escribiendo el archivo '%-.64s' (Error: %d)"
-	swe "Fick fel vid skrivning till '%-.64s' (Felkod %d)"
+	est "Viga faili '%-.200s' kirjutamisel (veakood: %d)"
+	ger "Fehler beim Speichern der Datei '%-.200s' (Fehler: %d)"
+	hun "Hiba a '%-.200s' file irasakor. (hibakod: %d)"
+	ita "Errore durante la scrittura del file '%-.200s' (errno: %d)"
+	nor "Feil ved skriving av fila '%-.200s' (Feilkode: %d)"
+	norwegian-ny "Feil ved skriving av fila '%-.200s' (Feilkode: %d)"
+	por "Erro ao gravar arquivo '%-.200s' (erro no. %d)"
+	rum "Eroare scriind fisierul '%-.200s' (errno: %d)"
+	spa "Error escribiendo el archivo '%-.200s' (Error: %d)"
+	swe "Fick fel vid skrivning till '%-.200s' (Felkod %d)"
 ER_FILE_USED  
@@ -741,7 +741,7 @@
 	serbian "Handler tabela za '%-.64s' nema ovu opciju"
 	spa "El manejador de la tabla de '%-.64s' no tiene esta opcion"
-	swe "Registrets databas har inte denna facilitet"
 ER_KEY_NOT_FOUND  
@@ -766,58 +766,58 @@
 	spa "No puedo encontrar el registro en '%-.64s'"
-	swe "Hittar inte posten"
+	swe "Hittar inte posten '%-.64s'"
 ER_NOT_FORM_FILE  
-	dan "Forkert indhold i: '%-.64s'"
-	nla "Verkeerde info in file: '%-.64s'"
+	dan "Forkert indhold i: '%-.200s'"
+	nla "Verkeerde info in file: '%-.200s'"
 	eng "Incorrect information in file: '%-.200s'"
-	est "Vigane informatsioon failis '%-.64s'"
-	ger "Falsche Information in Datei '%-.64s'"
-	hun "Ervenytelen info a file-ban: '%-.64s'"
-	ita "Informazione errata nel file: '%-.64s'"
-	nor "Feil informasjon i filen: '%-.64s'"
-	norwegian-ny "Feil informasjon i fila: '%-.64s'"
-	rum "Informatie incorecta in fisierul: '%-.64s'"
-	spa "Informacion erronea en el archivo: '%-.64s'"
-	swe "Felaktig fil: '%-.64s'"
+	est "Vigane informatsioon failis '%-.200s'"
+	ger "Falsche Information in Datei '%-.200s'"
+	hun "Ervenytelen info a file-ban: '%-.200s'"
+	ita "Informazione errata nel file: '%-.200s'"
+	nor "Feil informasjon i filen: '%-.200s'"
+	norwegian-ny "Feil informasjon i fila: '%-.200s'"
+	rum "Informatie incorecta in fisierul: '%-.200s'"
+	spa "Informacion erronea en el archivo: '%-.200s'"
+	swe "Felaktig fil: '%-.200s'"
 ER_NOT_KEYFILE  
-	nla "Verkeerde zoeksleutel file voor tabel: '%-.64s'; probeer het te repareren"
+	nla "Verkeerde zoeksleutel file voor tabel: '%-.200s'; probeer het te repareren"
 	eng "Incorrect key file for table '%-.200s'; try to repair it"
-	hun "Ervenytelen kulcsfile a tablahoz: '%-.64s'; probalja kijavitani!"
-	ita "File chiave errato per la tabella : '%-.64s'; prova a riparalo"
-	rum "Cheia fisierului incorecta pentru tabela: '%-.64s'; incearca s-o repari"
-	spa "Clave de archivo erronea para la tabla: '%-.64s'; intente repararlo"
+	hun "Ervenytelen kulcsfile a tablahoz: '%-.200s'; probalja kijavitani!"
+	ita "File chiave errato per la tabella : '%-.200s'; prova a riparalo"
+	rum "Cheia fisierului incorecta pentru tabela: '%-.200s'; incearca s-o repari"
+	spa "Clave de archivo erronea para la tabla: '%-.200s'; intente repararlo"
 ER_OLD_KEYFILE  
 	dan "Gammel indeksfil for tabellen '%-.64s'; reparer den"
@@ -1072,7 +1072,7 @@
-	ger "Benutzer '%-.32s'@'%-.64s' hat keine Zugriffsberechtigung (verwendetes Passwort: %-.64s)"
+	ger "Benutzer '%-.32s'@'%-.64s' hat keine Zugriffsberechtigung (verwendetes Passwort: %s)"
 	hun "A(z) '%-.32s'@'%-.64s' felhasznalo szamara tiltott eleres. (Hasznalja a jelszot: %s)"
 	ita "Accesso non consentito per l'utente: '%-.32s'@'%-.64s' (Password: %s)"
@@ -1239,28 +1239,28 @@
 ER_NON_UNIQ_ERROR 23000 
-	dan "Felt: '%-.64s' i tabel %s er ikke entydigt"
-	nla "Kolom: '%-.64s' in %s is niet eenduidig"
+	dan "Felt: '%-.64s' i tabel %-.64s er ikke entydigt"
+	nla "Kolom: '%-.64s' in %-.64s is niet eenduidig"
 	eng "Column '%-.64s' in %-.64s is ambiguous"
-	fre "Champ: '%-.64s' dans %s est ambigu"
+	fre "Champ: '%-.64s' dans %-.64s est ambigu"
 	ger "Feld '%-.64s' in %-.64s ist nicht eindeutig"
 	hun "A(z) '%-.64s' oszlop %-.64s-ben ketertelmu"
 	ita "Colonna: '%-.64s' di %-.64s e` ambigua"
 	jpn "Column: '%-.64s' in %-.64s is ambiguous"
-	nor "Felt: '%-.64s' i tabell %s er ikke entydig"
-	norwegian-ny "Kolonne: '%-.64s' i tabell %s er ikkje eintydig"
-	pol "Kolumna: '%-.64s' w  %s jest dwuznaczna"
+	nor "Felt: '%-.64s' i tabell %-.64s er ikke entydig"
+	norwegian-ny "Kolonne: '%-.64s' i tabell %-.64s er ikkje eintydig"
+	pol "Kolumna: '%-.64s' w  %-.64s jest dwuznaczna"
 	rum "Coloana: '%-.64s' in %-.64s este ambigua"
 	serbian "Kolona '%-.64s' u %-.64s nije jedinstvena u kontekstu"
-	spa "La columna: '%-.64s' en %s es ambigua"
+	spa "La columna: '%-.64s' en %-.64s es ambigua"
 ER_SERVER_SHUTDOWN 08S01 
@@ -1288,29 +1288,29 @@
 ER_BAD_FIELD_ERROR 42S22 S0022
-	dan "Ukendt kolonne '%-.64s' i tabel %s"
-	nla "Onbekende kolom '%-.64s' in %s"
+	dan "Ukendt kolonne '%-.64s' i tabel %-.64s"
+	nla "Onbekende kolom '%-.64s' in %-.64s"
 	eng "Unknown column '%-.64s' in '%-.64s'"
 	est "Tundmatu tulp '%-.64s' '%-.64s'-s"
-	fre "Champ '%-.64s' inconnu dans %s"
+	fre "Champ '%-.64s' inconnu dans %-.64s"
 	ger "Unbekanntes Tabellenfeld '%-.64s' in %-.64s"
 	hun "A(z) '%-.64s' oszlop ervenytelen '%-.64s'-ben"
 	ita "Colonna sconosciuta '%-.64s' in '%-.64s'"
-	nor "Ukjent kolonne '%-.64s' i tabell %s"
-	norwegian-ny "Ukjent felt '%-.64s' i tabell %s"
-	pol "Nieznana kolumna '%-.64s' w  %s"
+	nor "Ukjent kolonne '%-.64s' i tabell %-.64s"
+	norwegian-ny "Ukjent felt '%-.64s' i tabell %-.64s"
+	pol "Nieznana kolumna '%-.64s' w  %-.64s"
 	por "Coluna '%-.64s' desconhecida em '%-.64s'"
 	rum "Coloana invalida '%-.64s' in '%-.64s'"
 	serbian "Nepoznata kolona '%-.64s' u '%-.64s'"
-	spa "La columna '%-.64s' en %s es desconocida"
+	spa "La columna '%-.64s' en %-.64s es desconocida"
 ER_WRONG_FIELD_WITH_GROUP 42000 S1009
@@ -1404,29 +1404,29 @@
 ER_TOO_LONG_IDENT 42000 S1009
-	dan "Navnet '%-.64s' er for langt"
-	nla "Naam voor herkenning '%-.64s' is te lang"
+	dan "Navnet '%-.100s' er for langt"
+	nla "Naam voor herkenning '%-.100s' is te lang"
 	eng "Identifier name '%-.100s' is too long"
 	est "Identifikaatori '%-.100s' nimi on liiga pikk"
-	fre "Le nom de l'identificateur '%-.64s' est trop long"
+	fre "Le nom de l'identificateur '%-.100s' est trop long"
 	ger "Name des Bezeichners '%-.100s' ist zu lang"
 	hun "A(z) '%-.100s' azonositonev tul hosszu."
 	ita "Il nome dell'identificatore '%-.100s' e` troppo lungo"
-	nor "Identifikator '%-.64s' er for lang"
-	norwegian-ny "Identifikator '%-.64s' er for lang"
+	nor "Identifikator '%-.100s' er for lang"
+	norwegian-ny "Identifikator '%-.100s' er for lang"
 	rum "Numele indentificatorului '%-.100s' este prea lung"
-	spa "El nombre del identificador '%-.64s' es demasiado grande"
+	spa "El nombre del identificador '%-.100s' es demasiado grande"
 ER_DUP_FIELDNAME 42S21 S1009
@@ -1527,29 +1527,29 @@
 ER_PARSE_ERROR 42000 
-	nla "%s bij '%-.64s' in regel %d"
+	nla "%s bij '%-.80s' in regel %d"
 	eng "%s near '%-.80s' at line %d"
 	est "%s '%-.80s' ligidal real %d"
 	ger "%s bei '%-.80s' in Zeile %d"
 	hun "A %s a '%-.80s'-hez kozeli a %d sorban"
 	ita "%s vicino a '%-.80s' linea %d"
-	pol "%s obok '%-.64s' w linii %d"
+	pol "%s obok '%-.80s' w linii %d"
 	rum "%s linga '%-.80s' pe linia %d"
 	serbian "'%s' u iskazu '%-.80s' na liniji %d"
-	spa "%s cerca '%-.64s' en la linea %d"
+	spa "%s cerca '%-.80s' en la linea %d"
 ER_EMPTY_QUERY 42000  
@@ -1821,30 +1821,30 @@
 ER_READY  
-	dan "%s: klar til tilslutninger"
-	nla "%s: klaar voor verbindingen"
+	dan "%s: klar til tilslutninger\nVersion: '%s'  socket: '%s'  port: %d"
+	nla "%s: klaar voor verbindingen\nVersion: '%s'  socket: '%s'  port: %d"
 	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d"
-	hun "%s: kapcsolatra kesz"
-	ita "%s: Pronto per le connessioni\n"
-	nor "%s: klar for tilkoblinger"
-	norwegian-ny "%s: klar for tilkoblingar"
-	rum "%s: sint gata pentru conectii"
-	serbian "%s: Spreman za konekcije\n"
-	spa "%s: preparado para conexiones"
-	swe "%s: klar att ta emot klienter"
+	hun "%s: kapcsolatra kesz\nVersion: '%s'  socket: '%s'  port: %d"
+	ita "%s: Pronto per le connessioni\nVersion: '%s'  socket: '%s'  port: %d"
+	nor "%s: klar for tilkoblinger\nVersion: '%s'  socket: '%s'  port: %d"
+	norwegian-ny "%s: klar for tilkoblingar\nVersion: '%s'  socket: '%s'  port: %d"
+	rum "%s: sint gata pentru conectii\nVersion: '%s'  socket: '%s'  port: %d"
+	serbian "%s: Spreman za konekcije\nVersion: '%s'  socket: '%s'  port: %d"
+	spa "%s: preparado para conexiones\nVersion: '%s'  socket: '%s'  port: %d"
+	swe "%s: klar att ta emot klienter\nVersion: '%s'  socket: '%s'  port: %d"
 ER_NORMAL_SHUTDOWN  
 	dan "%s: Normal nedlukning\n"
@@ -1852,7 +1852,7 @@
 	eng "%s: Normal shutdown\n"
-	ger "%-.64s: Normal heruntergefahren\n"
+	ger "%s: Normal heruntergefahren\n"
 	hun "%s: Normal leallitas\n"
 	ita "%s: Shutdown normale\n"
@@ -1876,7 +1876,7 @@
-	ger "%-.64s: Signal %d erhalten. Abbruch!\n"
+	ger "%s: Signal %d erhalten. Abbruch!\n"
 	hun "%s: %d jelzes. Megszakitva!\n"
 	ita "%s: Ricevuto segnale %d. Interruzione!\n"
@@ -1901,7 +1901,7 @@
-	ger "%-.64s: Herunterfahren beendet\n"
+	ger "%s: Herunterfahren beendet\n"
 	hun "%s: A leallitas kesz\n"
 	ita "%s: Shutdown completato\n"
@@ -1919,29 +1919,29 @@
 	swe "%s: Avslutning klar\n"
 ER_FORCING_CLOSE 08S01 
-	nla "%s: Afsluiten afgedwongen van thread %ld  gebruiker: '%-.64s'\n"
+	nla "%s: Afsluiten afgedwongen van thread %ld  gebruiker: '%-.32s'\n"
 	eng "%s: Forcing close of thread %ld  user: '%-.32s'\n"
 	ger "%s: Thread %ld zwangsweise beendet. Benutzer: '%-.32s'\n"
-	hun "%s: A(z) %ld thread kenyszeritett zarasa. Felhasznalo: '%-.64s'\n"
-	ita "%s: Forzata la chiusura del thread %ld utente: '%-.64s'\n"
+	hun "%s: A(z) %ld thread kenyszeritett zarasa. Felhasznalo: '%-.32s'\n"
+	ita "%s: Forzata la chiusura del thread %ld utente: '%-.32s'\n"
 	rum "%s: Terminare fortata a thread-ului %ld  utilizatorului: '%-.32s'\n"
-	spa "%s: Forzando a cerrar el thread %ld  usuario: '%-.64s'\n"
+	spa "%s: Forzando a cerrar el thread %ld  usuario: '%-.32s'\n"
 ER_IPSOCK_ERROR 08S01 
@@ -2041,55 +2041,55 @@
 ER_TEXTFILE_NOT_READABLE  
-	nla "Het bestand '%-.64s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
+	nla "Het bestand '%-.128s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
 	eng "The file '%-.128s' must be in the database directory or be readable by all"
-	hun "A(z) '%-.64s'-nak az adatbazis konyvtarban kell lennie, vagy mindenki szamara olvashatonak"
-	ita "Il file '%-.64s' deve essere nella directory del database e deve essere leggibile da tutti"
-	rum "Fisierul '%-.64s' trebuie sa fie in directorul bazei de data sau trebuie sa poata sa fie citit de catre toata lumea (verifica permisiile)"
-	spa "El archivo '%-.64s' debe estar en el directorio de la base de datos o ser de lectura por todos"
+	hun "A(z) '%-.128s'-nak az adatbazis konyvtarban kell lennie, vagy mindenki szamara olvashatonak"
+	ita "Il file '%-.128s' deve essere nella directory del database e deve essere leggibile da tutti"
+	rum "Fisierul '%-.128s' trebuie sa fie in directorul bazei de data sau trebuie sa poata sa fie citit de catre toata lumea (verifica permisiile)"
+	spa "El archivo '%-.128s' debe estar en el directorio de la base de datos o ser de lectura por todos"
 ER_FILE_EXISTS_ERROR  
-	dan "Filen '%-.64s' eksisterer allerede"
-	nla "Het bestand '%-.64s' bestaat reeds"
+	dan "Filen '%-.200s' eksisterer allerede"
+	nla "Het bestand '%-.200s' bestaat reeds"
 	eng "File '%-.200s' already exists"
-	est "Fail '%-.80s' juba eksisteerib"
-	ger "Datei '%-.80s' bereits vorhanden"
-	hun "A '%-.64s' file mar letezik."
-	ita "Il file '%-.64s' esiste gia`"
-	nor "Filen '%-.64s' eksisterte allerede"
-	norwegian-ny "Filen '%-.64s' eksisterte allereide"
-	rum "Fisierul '%-.80s' exista deja"
-	spa "El archivo '%-.64s' ya existe"
-	swe "Filen '%-.64s' existerar redan"
+	est "Fail '%-.200s' juba eksisteerib"
+	ger "Datei '%-.200s' bereits vorhanden"
+	hun "A '%-.200s' file mar letezik."
+	ita "Il file '%-.200s' esiste gia`"
+	nor "Filen '%-.200s' eksisterte allerede"
+	norwegian-ny "Filen '%-.200s' eksisterte allereide"
+	rum "Fisierul '%-.200s' exista deja"
+	spa "El archivo '%-.200s' ya existe"
+	swe "Filen '%-.200s' existerar redan"
 ER_LOAD_INFO  
 	dan "Poster: %ld  Fjernet: %ld  Sprunget over: %ld  Advarsler: %ld"
@@ -2319,51 +2319,51 @@
 	swe "Inga tabeller angivna"
 ER_TOO_BIG_SET  
 	dan "For mange tekststrenge til specifikationen af SET i kolonne %-.64s"
-	nla "Teveel strings voor kolom %s en SET"
+	nla "Teveel strings voor kolom %-.64s en SET"
 	eng "Too many strings for column %-.64s and SET"
 	hun "Tul sok karakter: %-.64s es SET"
 	ita "Troppe stringhe per la colonna %-.64s e la SET"
-	nor "For mange tekststrenger kolonne %s og SET"
-	norwegian-ny "For mange tekststrengar felt %s og SET"
+	nor "For mange tekststrenger kolonne %-.64s og SET"
+	norwegian-ny "For mange tekststrengar felt %-.64s og SET"
 	por "'Strings' demais para coluna '%-.64s' e SET"
 	rum "Prea multe siruri pentru coloana %-.64s si SET"
-	spa "Muchas strings para columna %s y SET"
+	spa "Muchas strings para columna %-.64s y SET"
 ER_NO_UNIQUE_LOGFILE  
-	dan "Kan ikke lave unikt log-filnavn %s.(1-999)\n"
-	nla "Het is niet mogelijk een unieke naam te maken voor de logfile %s.(1-999)\n"
+	dan "Kan ikke lave unikt log-filnavn %-.200s.(1-999)\n"
+	nla "Het is niet mogelijk een unieke naam te maken voor de logfile %-.200s.(1-999)\n"
 	eng "Can't generate a unique log-filename %-.200s.(1-999)\n"
-	est "Ei suuda luua unikaalset logifaili nime %-.64s.(1-999)\n"
-	hun "Egyedi log-filenev nem generalhato: %-.64s.(1-999)\n"
-	ita "Impossibile generare un nome del file log unico %-.64s.(1-999)\n"
-	nor "Kan ikke lage unikt loggfilnavn %s.(1-999)\n"
-	norwegian-ny "Kan ikkje lage unikt loggfilnavn %s.(1-999)\n"
-	rum "Nu pot sa generez un nume de log unic %-.64s.(1-999)\n"
-	spa "No puede crear un unico archivo log %s.(1-999)\n"
-	swe "Kan inte generera ett unikt filnamn %s.(1-999)\n"
+	est "Ei suuda luua unikaalset logifaili nime %-.200s.(1-999)\n"
+	hun "Egyedi log-filenev nem generalhato: %-.200s.(1-999)\n"
+	ita "Impossibile generare un nome del file log unico %-.200s.(1-999)\n"
+	nor "Kan ikke lage unikt loggfilnavn %-.200s.(1-999)\n"
+	norwegian-ny "Kan ikkje lage unikt loggfilnavn %-.200s.(1-999)\n"
+	rum "Nu pot sa generez un nume de log unic %-.200s.(1-999)\n"
+	spa "No puede crear un unico archivo log %-.200s.(1-999)\n"
+	swe "Kan inte generera ett unikt filnamn %-.200s.(1-999)\n"
 ER_TABLE_NOT_LOCKED_FOR_WRITE  
@@ -2439,54 +2439,54 @@
 ER_WRONG_DB_NAME 42000 
-	dan "Ugyldigt database navn '%-.64s'"
-	nla "Databasenaam '%-.64s' is niet getoegestaan"
+	dan "Ugyldigt database navn '%-.100s'"
+	nla "Databasenaam '%-.100s' is niet getoegestaan"
 	eng "Incorrect database name '%-.100s'"
 	est "Vigane andmebaasi nimi '%-.100s'"
 	ger "Unerlaubter Datenbankname '%-.100s'"
 	hun "Hibas adatbazisnev: '%-.100s'"
 	ita "Nome database errato '%-.100s'"
-	nor "Ugyldig database navn '%-.64s'"
-	norwegian-ny "Ugyldig database namn '%-.64s'"
-	pol "Niedozwolona nazwa bazy danych '%-.64s'"
+	nor "Ugyldig database navn '%-.100s'"
+	norwegian-ny "Ugyldig database namn '%-.100s'"
+	pol "Niedozwolona nazwa bazy danych '%-.100s'"
 	por "Nome de banco de dados '%-.100s' incorreto"
 	rum "Numele bazei de date este incorect '%-.100s'"
-	spa "Nombre de base de datos ilegal '%-.64s'"
-	swe "Felaktigt databasnamn '%-.64s'"
+	spa "Nombre de base de datos ilegal '%-.100s'"
+	swe "Felaktigt databasnamn '%-.100s'"
 ER_WRONG_TABLE_NAME 42000 
-	dan "Ugyldigt tabel navn '%-.64s'"
-	nla "Niet toegestane tabelnaam '%-.64s'"
+	dan "Ugyldigt tabel navn '%-.100s'"
+	nla "Niet toegestane tabelnaam '%-.100s'"
 	eng "Incorrect table name '%-.100s'"
 	est "Vigane tabeli nimi '%-.100s'"
 	ger "Unerlaubter Tabellenname '%-.100s'"
 	hun "Hibas tablanev: '%-.100s'"
 	ita "Nome tabella errato '%-.100s'"
-	nor "Ugyldig tabell navn '%-.64s'"
-	norwegian-ny "Ugyldig tabell namn '%-.64s'"
-	pol "Niedozwolona nazwa tabeli '%-.64s'..."
+	nor "Ugyldig tabell navn '%-.100s'"
+	norwegian-ny "Ugyldig tabell namn '%-.100s'"
+	pol "Niedozwolona nazwa tabeli '%-.100s'..."
 	por "Nome de tabela '%-.100s' incorreto"
 	rum "Numele tabelei este incorect '%-.100s'"
-	spa "Nombre de tabla ilegal '%-.64s'"
-	swe "Felaktigt tabellnamn '%-.64s'"
+	spa "Nombre de tabla ilegal '%-.100s'"
+	swe "Felaktigt tabellnamn '%-.100s'"
 ER_TOO_BIG_SELECT 42000 
@@ -2534,97 +2534,97 @@
 	swe "Oidentifierat fel"
 ER_UNKNOWN_PROCEDURE 42000 
-	dan "Ukendt procedure %s"
-	nla "Onbekende procedure %s"
+	dan "Ukendt procedure %-.64s"
+	nla "Onbekende procedure %-.64s"
 	eng "Unknown procedure '%-.64s'"
 	est "Tundmatu protseduur '%-.64s'"
 	ger "Unbekannte Prozedur '%-.64s'"
 	hun "Ismeretlen eljaras: '%-.64s'"
 	ita "Procedura '%-.64s' sconosciuta"
-	nor "Ukjent prosedyre %s"
-	norwegian-ny "Ukjend prosedyre %s"
-	pol "Unkown procedure %s"
+	nor "Ukjent prosedyre %-.64s"
+	norwegian-ny "Ukjend prosedyre %-.64s"
+	pol "Unkown procedure %-.64s"
 	por "'Procedure' '%-.64s' desconhecida"
 	rum "Procedura unknown '%-.64s'"
 	serbian "Nepoznata procedura '%-.64s'"
-	spa "Procedimiento desconocido %s"
+	spa "Procedimiento desconocido %-.64s"
 ER_WRONG_PARAMCOUNT_TO_PROCEDURE 42000 
-	dan "Forkert antal  parametre til proceduren %s"
-	nla "Foutief aantal parameters doorgegeven aan procedure %s"
+	dan "Forkert antal  parametre til proceduren %-.64s"
+	nla "Foutief aantal parameters doorgegeven aan procedure %-.64s"
 	eng "Incorrect parameter count to procedure '%-.64s'"
 	est "Vale parameetrite hulk protseduurile '%-.64s'"
 	hun "Rossz parameter a(z) '%-.64s'eljaras szamitasanal"
 	ita "Numero di parametri errato per la procedura '%-.64s'"
-	nor "Feil parameter antall til prosedyren %s"
-	norwegian-ny "Feil parameter tal til prosedyra %s"
-	pol "Incorrect parameter count to procedure %s"
+	nor "Feil parameter antall til prosedyren %-.64s"
+	norwegian-ny "Feil parameter tal til prosedyra %-.64s"
+	pol "Incorrect parameter count to procedure %-.64s"
 	rum "Procedura '%-.64s' are un numar incorect de parametri"
-	spa "Equivocado parametro count para procedimiento %s"
-	swe "Felaktigt antal parametrar till procedur %s"
+	spa "Equivocado parametro count para procedimiento %-.64s"
+	swe "Felaktigt antal parametrar till procedur %-.64s"
 ER_WRONG_PARAMETERS_TO_PROCEDURE  
-	dan "Forkert(e) parametre til proceduren %s"
-	nla "Foutieve parameters voor procedure %s"
+	dan "Forkert(e) parametre til proceduren %-.64s"
+	nla "Foutieve parameters voor procedure %-.64s"
 	eng "Incorrect parameters to procedure '%-.64s'"
 	est "Vigased parameetrid protseduurile '%-.64s'"
 	hun "Rossz parameter a(z) '%-.64s' eljarasban"
 	ita "Parametri errati per la procedura '%-.64s'"
-	nor "Feil parametre til prosedyren %s"
-	norwegian-ny "Feil parameter til prosedyra %s"
-	pol "Incorrect parameters to procedure %s"
+	nor "Feil parametre til prosedyren %-.64s"
+	norwegian-ny "Feil parameter til prosedyra %-.64s"
+	pol "Incorrect parameters to procedure %-.64s"
 	rum "Procedura '%-.64s' are parametrii incorecti"
-	spa "Equivocados parametros para procedimiento %s"
-	swe "Felaktiga parametrar till procedur %s"
+	spa "Equivocados parametros para procedimiento %-.64s"
+	swe "Felaktiga parametrar till procedur %-.64s"
 ER_UNKNOWN_TABLE 42S02 
-	dan "Ukendt tabel '%-.64s' i %s"
-	nla "Onbekende tabel '%-.64s' in %s"
+	dan "Ukendt tabel '%-.64s' i %-.32s"
+	nla "Onbekende tabel '%-.64s' in %-.32s"
 	eng "Unknown table '%-.64s' in %-.32s"
 	est "Tundmatu tabel '%-.64s' %-.32s-s"
-	fre "Table inconnue '%-.64s' dans %s"
-	ger "Unbekannte Tabelle '%-.64s' in '%-.64s'"
-	hun "Ismeretlen tabla: '%-.64s' %s-ban"
-	ita "Tabella '%-.64s' sconosciuta in %s"
-	jpn "Unknown table '%-.64s' in %s"
-	nor "Ukjent tabell '%-.64s' i %s"
-	norwegian-ny "Ukjend tabell '%-.64s' i %s"
-	pol "Unknown table '%-.64s' in %s"
+	fre "Table inconnue '%-.64s' dans %-.32s"
+	ger "Unbekannte Tabelle '%-.64s' in '%-.32s'"
+	hun "Ismeretlen tabla: '%-.64s' %-.32s-ban"
+	ita "Tabella '%-.64s' sconosciuta in %-.32s"
+	jpn "Unknown table '%-.64s' in %-.32s"
+	nor "Ukjent tabell '%-.64s' i %-.32s"
+	norwegian-ny "Ukjend tabell '%-.64s' i %-.32s"
+	pol "Unknown table '%-.64s' in %-.32s"
 	por "Tabela '%-.64s' desconhecida em '%-.32s'"
 	rum "Tabla '%-.64s' invalida in %-.32s"
 	serbian "Nepoznata tabela '%-.64s' u '%-.32s'"
-	spa "Tabla desconocida '%-.64s' in %s"
+	spa "Tabla desconocida '%-.64s' in %-.32s"
 ER_FIELD_SPECIFIED_TWICE 42000 
@@ -2803,27 +2803,27 @@
 ER_TOO_BIG_ROWSIZE 42000 
-	nla "Rij-grootte is groter dan toegestaan. Maximale rij grootte, blobs niet meegeteld, is %d. U dient sommige velden in blobs te veranderen."
+	nla "Rij-grootte is groter dan toegestaan. Maximale rij grootte, blobs niet meegeteld, is %ld. U dient sommige velden in blobs te veranderen."
 	eng "Row size too large. The maximum row size for the used table type, not counting BLOBs, is %ld. You have to change some columns to TEXT or BLOBs"
-	fre "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB"
+	fre "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %ld. Changez le type de quelques colonnes en BLOB"
-	hun "Tul nagy sormeret. A maximalis sormeret (nem szamolva a blob objektumokat) %d. Nehany mezot meg kell valtoztatnia"
-	ita "Riga troppo grande. La massima grandezza di una riga, non contando i BLOB, e` %d. Devi cambiare alcuni campi in BLOB"
-	rum "Marimea liniei (row) prea mare. Marimea maxima a liniei, excluzind BLOB-urile este de %d. Trebuie sa schimbati unele cimpuri in BLOB-uri"
+	hun "Tul nagy sormeret. A maximalis sormeret (nem szamolva a blob objektumokat) %ld. Nehany mezot meg kell valtoztatnia"
+	ita "Riga troppo grande. La massima grandezza di una riga, non contando i BLOB, e` %ld. Devi cambiare alcuni campi in BLOB"
+	rum "Marimea liniei (row) prea mare. Marimea maxima a liniei, excluzind BLOB-urile este de %ld. Trebuie sa schimbati unele cimpuri in BLOB-uri"
 ER_STACK_OVERRUN  
@@ -2865,29 +2865,29 @@
 	swe "Felaktigt referens i OUTER JOIN.  Kontrollera ON-uttrycket"
 ER_NULL_COLUMN_IN_INDEX 42000 
-	dan "Kolonne '%-.32s' bruges som UNIQUE eller INDEX men er ikke defineret som NOT NULL"
+	dan "Kolonne '%-.64s' bruges som UNIQUE eller INDEX men er ikke defineret som NOT NULL"
 	nla "Kolom '%-.64s' wordt gebruikt met UNIQUE of INDEX maar is niet gedefinieerd als NOT NULL"
 	eng "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
 	ger "Spalte '%-.64s' wurde mit UNIQUE oder INDEX benutzt, ist aber nicht als NOT NULL definiert"
 	hun "A(z) '%-.64s' oszlop INDEX vagy UNIQUE (egyedi), de a definicioja szerint nem NOT NULL"
 	ita "La colonna '%-.64s' e` usata con UNIQUE o INDEX ma non e` definita come NOT NULL"
-	nor "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
-	norwegian-ny "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
-	pol "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
+	nor "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
+	norwegian-ny "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
+	pol "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
 	rum "Coloana '%-.64s' e folosita cu UNIQUE sau INDEX dar fara sa fie definita ca NOT NULL"
 	serbian "Kolona '%-.64s' je upotrebljena kao 'UNIQUE' ili 'INDEX' ali nije definisana kao 'NOT NULL'"
 ER_CANT_FIND_UDF  
@@ -2995,13 +2995,13 @@
 	norwegian-ny "Can't open shared library '%-.64s' (errno: %d %-.128s)"
 	pol "Can't open shared library '%-.64s' (errno: %d %-.128s)"
-	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %-.64s)"
-	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %-.64s)"
-	spa "No puedo abrir libraria conjugada '%-.64s' (errno: %d %s)"
+	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %-.128s)"
+	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %-.128s)"
+	spa "No puedo abrir libraria conjugada '%-.64s' (errno: %d %-.128s)"
 ER_CANT_FIND_DL_ENTRY  
 	dan "Kan ikke finde funktionen '%-.128s' i bibliotek"
@@ -3048,14 +3048,14 @@
 ER_HOST_IS_BLOCKED  
 	nla "Host '%-.64s' is geblokkeeerd vanwege te veel verbindings fouten. Deblokkeer met 'mysqladmin flush-hosts'"
 	eng "Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'"
 	ger "Host '%-.64s' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'"
 	hun "A '%-.64s' host blokkolodott, tul sok kapcsolodasi hiba miatt. Hasznalja a 'mysqladmin flush-hosts' parancsot"
 	ita "Sistema '%-.64s' bloccato a causa di troppi errori di connessione. Per sbloccarlo: 'mysqladmin flush-hosts'"
@@ -3076,7 +3076,7 @@
 	ger "Host '%-.64s' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden"
 	hun "A '%-.64s' host szamara nem engedelyezett a kapcsolodas ehhez a MySQL szerverhez"
 	ita "Al sistema '%-.64s' non e` consentita la connessione a questo server MySQL"
@@ -3288,25 +3288,25 @@
 ER_NONEXISTING_GRANT 42000 
-	nla "Deze toegang (GRANT) is niet toegekend voor gebruiker '%-.32s' op host '%-.64s'"
-	eng "There is no such grant defined for user '%-.32s' on host '%-.64s'"
-	hun "A '%-.32s' felhasznalonak nincs ilyen joga a '%-.64s' host-on"
-	ita "GRANT non definita per l'utente '%-.32s' dalla macchina '%-.64s'"
-	rum "Nu exista un astfel de grant definit pentru utilzatorul '%-.32s' de pe host-ul '%-.64s'"
-	serbian "Ne postoji odobrenje za pristup korisniku '%-.32s' na host-u '%-.64s'"
-	spa "No existe permiso definido para usuario '%-.32s' en el servidor '%-.64s'"
+	nla "Deze toegang (GRANT) is niet toegekend voor gebruiker '%-.64s' op host '%-.64s'"
+	eng "There is no such grant defined for user '%-.64s' on host '%-.64s'"
+	hun "A '%-.64s' felhasznalonak nincs ilyen joga a '%-.64s' host-on"
+	ita "GRANT non definita per l'utente '%-.64s' dalla macchina '%-.64s'"
+	rum "Nu exista un astfel de grant definit pentru utilzatorul '%-.64s' de pe host-ul '%-.64s'"
+	serbian "Ne postoji odobrenje za pristup korisniku '%-.64s' na host-u '%-.64s'"
+	spa "No existe permiso definido para usuario '%-.64s' en el servidor '%-.64s'"
 ER_TABLEACCESS_DENIED_ERROR 42000 
 	dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.32s'@'%-.64s' for tabellen '%-.64s'"
@@ -3390,27 +3390,27 @@
 ER_NO_SUCH_TABLE 42S02 
-	cze "Tabulka '%-.64s.%s' neexistuje"
+	cze "Tabulka '%-.64s.%-.64s' neexistuje"
 	dan "Tabellen '%-.64s.%-.64s' eksisterer ikke"
-	nla "Tabel '%-.64s.%s' bestaat niet"
+	nla "Tabel '%-.64s.%-.64s' bestaat niet"
 	eng "Table '%-.64s.%-.64s' doesn't exist"
 	est "Tabelit '%-.64s.%-.64s' ei eksisteeri"
-	fre "La table '%-.64s.%s' n'existe pas"
+	fre "La table '%-.64s.%-.64s' n'existe pas"
 	ger "Tabelle '%-.64s.%-.64s' existiert nicht"
-	hun "A '%-.64s.%s' tabla nem letezik"
-	ita "La tabella '%-.64s.%s' non esiste"
-	jpn "Table '%-.64s.%s' doesn't exist"
-	nor "Table '%-.64s.%s' doesn't exist"
-	norwegian-ny "Table '%-.64s.%s' doesn't exist"
-	pol "Table '%-.64s.%s' doesn't exist"
+	hun "A '%-.64s.%-.64s' tabla nem letezik"
+	ita "La tabella '%-.64s.%-.64s' non esiste"
+	jpn "Table '%-.64s.%-.64s' doesn't exist"
+	nor "Table '%-.64s.%-.64s' doesn't exist"
+	norwegian-ny "Table '%-.64s.%-.64s' doesn't exist"
+	pol "Table '%-.64s.%-.64s' doesn't exist"
 	rum "Tabela '%-.64s.%-.64s' nu exista"
 	serbian "Tabela '%-.64s.%-.64s' ne postoji"
-	slo "Table '%-.64s.%s' doesn't exist"
-	spa "Tabla '%-.64s.%s' no existe"
-	swe "Det finns ingen tabell som heter '%-.64s.%s'"
+	slo "Table '%-.64s.%-.64s' doesn't exist"
+	spa "Tabla '%-.64s.%-.64s' no existe"
+	swe "Det finns ingen tabell som heter '%-.64s.%-.64s'"
 ER_NONEXISTING_TABLE_GRANT 42000 
@@ -3509,27 +3509,27 @@
 ER_ABORTING_CONNECTION 08S01 
-	dan "Afbrudt forbindelse %ld til database: '%-.64s' bruger: '%-.64s' (%-.64s)"
-	nla "Afgebroken verbinding %ld naar db: '%-.64s' gebruiker: '%-.64s' (%s)"
+	dan "Afbrudt forbindelse %ld til database: '%-.64s' bruger: '%-.32s' (%-.64s)"
+	nla "Afgebroken verbinding %ld naar db: '%-.64s' gebruiker: '%-.32s' (%-.64s)"
 	eng "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
-	ger "Abbruch der Verbindung %ld zur Datenbank '%-.64s'. Benutzer: '%-.64s' (%-.64s)"
-	hun "Megszakitott kapcsolat %ld db: '%-.64s' adatbazishoz, felhasznalo: '%-.64s' (%s)"
-	ita "Interrotta la connessione %ld al db: '%-.64s' utente: '%-.64s' (%s)"
-	jpn "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
-	nor "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
-	norwegian-ny "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
-	pol "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
+	ger "Abbruch der Verbindung %ld zur Datenbank '%-.64s'. Benutzer: '%-.32s' (%-.64s)"
+	hun "Megszakitott kapcsolat %ld db: '%-.64s' adatbazishoz, felhasznalo: '%-.32s' (%-.64s)"
+	ita "Interrotta la connessione %ld al db: '%-.64s' utente: '%-.32s' (%-.64s)"
+	jpn "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
+	nor "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
+	norwegian-ny "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
+	pol "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
 	rum "Conectie terminata %ld la baza de date: '%-.64s' utilizator: '%-.32s' (%-.64s)"
 	serbian "Prekinuta konekcija broj %ld ka bazi: '%-.64s' korisnik je bio: '%-.32s' (%-.64s)"
-	slo "Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)"
+	slo "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)"
 ER_NET_PACKET_TOO_LARGE 08S01 
@@ -4008,7 +4008,7 @@
 	rum "The handler for the table doesn't support %s"
-	serbian "Handler za ovu tabelu ne dozvoljava 'check' odnosno 'repair' komande"
+	serbian "Handler za ovu tabelu ne dozvoljava %s komande"
 	slo "The handler for the table doesn't support %s"
 	spa "El manipulador de la tabla no permite soporte para %s"
@@ -5045,7 +5045,7 @@
 ER_DUPLICATED_VALUE_IN_TYPE  
 	eng "Column '%-.100s' has duplicated value '%-.64s' in %s"
 	ger "Feld '%-.100s' hat doppelten Wert '%-.64s' in %s"
@@ -5219,9 +5219,9 @@
 ER_FPARSER_EOF_IN_COMMENT  
 	eng "Unexpected end of file while parsing comment '%-.200s'"
-	ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.64s'"
+	ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.200s'"
 ER_FPARSER_ERROR_IN_PARAMETER  
 	eng "Error while parsing parameter '%-.64s' (line: '%-.64s')"
 	ger "Fehler beim Parsen des Parameters '%-.64s' (Zeile: '%-.64s')"
@@ -5306,7 +5306,7 @@
 ER_TRG_CANT_CHANGE_ROW  
 	eng "Updating of %s row is not allowed in %strigger"
-	ger "Aktualisieren einer %s-Zeile ist in einem %-Trigger nicht erlaubt"
+	ger "Aktualisieren einer %s-Zeile ist in einem %s-Trigger nicht erlaubt"
 ER_TRG_NO_SUCH_ROW_IN_TRG  
 	eng "There is no %s row in %s trigger"
 	ger "Es gibt keine %s-Zeile im %s-Trigger"
@@ -5388,7 +5388,7 @@
 ER_NO_FILE_MAPPING  
 	eng "Can't map file: %-.200s, errno: %d"
-	ger "Kann Datei nicht abbilden: %-.64s, Fehler: %d"
+	ger "Kann Datei nicht abbilden: %-.200s, Fehler: %d"
 ER_WRONG_MAGIC  
 	eng "Wrong magic in %-.64s"
 	ger "Falsche magische Zahlen in %-.64s"
@@ -5523,7 +5523,7 @@
         eng "Unable to connect to foreign data source: %.64s"
 	ger "Kann nicht mit Fremddatenquelle verbinden: %.64s"
 ER_QUERY_ON_FOREIGN_DATA_SOURCE
-        eng "There was a problem processing the query on the foreign data source. Data source error: %-.64"
+        eng "There was a problem processing the query on the foreign data source. Data source error: %-.64s"
 	ger "Bei der Verarbeitung der Abfrage ist in der Fremddatenquelle ein Problem aufgetreten. Datenquellenfehlermeldung: %-.64s"
 ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST
         eng "The foreign data source you are trying to reference does not exist. Data source error:  %-.64s"
Thread
bk commit into 5.0 tree (msvensson:1.2414) BUG#26571msvensson22 Feb