Merge bk@192.168.21.1:mysql-5.0-kt

into  mysql.com:/home/hf/work/mysql-5.0.19672


sql/share/errmsg.txt:
  Auto merged

1 files changed, 13 insertions, 13 deletions

diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 9b20c37ece2..ad67a9a491e 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -54,7 +54,7 @@ ER_CANT_CREATE_FILE
 	cze "Nemohu vytvo-B�it soubor '%-.64s' (chybov� k�d: %d)"
 	dan "Kan ikke oprette filen '%-.64s' (Fejlkode: %d)"
 	nla "Kan file '%-.64s' niet aanmaken (Errcode: %d)"
-	eng "Can't create file '%-.64s' (errno: %d)"
+	eng "Can't create file '%-.200s' (errno: %d)"
 	est "Ei suuda luua faili '%-.64s' (veakood: %d)"
 	fre "Ne peut cr�er le fichier '%-.64s' (Errcode: %d)"
 	ger "Kann Datei '%-.64s' nicht erzeugen (Fehler: %d)"
@@ -278,7 +278,7 @@ ER_CANT_GET_STAT
 	cze "Nemohu z-B�skat stav '%-.64s' (chybov� k�d: %d)"
 	dan "Kan ikke l�se status af '%-.64s' (Fejlkode: %d)"
 	nla "Kan de status niet krijgen van '%-.64s' (Errcode: %d)"
-	eng "Can't get status of '%-.64s' (errno: %d)"
+	eng "Can't get status of '%-.200s' (errno: %d)"
 	jps "'%-.64s' �̃X�e�C�^�X�������܂���. (errno: %d)",
 	est "Ei suuda lugeda '%-.64s' olekut (veakood: %d)"
 	fre "Ne peut obtenir le status de '%-.64s' (Errcode: %d)"
@@ -353,7 +353,7 @@ ER_CANT_OPEN_FILE
 	cze "Nemohu otev-B��t soubor '%-.64s' (chybov� k�d: %d)"
 	dan "Kan ikke �bne fil: '%-.64s' (Fejlkode: %d)"
 	nla "Kan de file '%-.64s' niet openen (Errcode: %d)"
-	eng "Can't open file: '%-.64s' (errno: %d)"
+	eng "Can't open file: '%-.200s' (errno: %d)"
 	jps "'%-.64s' �t�@�C�����J�������ł��܂��� (errno: %d)",
 	est "Ei suuda avada faili '%-.64s' (veakood: %d)"
 	fre "Ne peut ouvrir le fichier: '%-.64s' (Errcode: %d)"
@@ -378,7 +378,7 @@ ER_FILE_NOT_FOUND
 	cze "Nemohu naj-B�t soubor '%-.64s' (chybov� k�d: %d)"
 	dan "Kan ikke finde fila: '%-.64s' (Fejlkode: %d)"
 	nla "Kan de file: '%-.64s' niet vinden (Errcode: %d)"
-	eng "Can't find file: '%-.64s' (errno: %d)"
+	eng "Can't find file: '%-.200s' (errno: %d)"
 	jps "'%-.64s' �t�@�C�������t���鎖���ł��܂���.(errno: %d)",
 	est "Ei suuda leida faili '%-.64s' (veakood: %d)"
 	fre "Ne peut trouver le fichier: '%-.64s' (Errcode: %d)"
@@ -549,7 +549,7 @@ ER_ERROR_ON_READ
 	cze "Chyba p-B�i �ten� souboru '%-.64s' (chybov� k�d: %d)"
 	dan "Fejl ved l�sning af '%-.64s' (Fejlkode: %d)"
 	nla "Fout bij het lezen van file '%-.64s' (Errcode: %d)"
-	eng "Error reading file '%-.64s' (errno: %d)"
+	eng "Error reading file '%-.200s' (errno: %d)"
 	jps "'%-.64s' �t�@�C���̓ǂݍ��݃G���[ (errno: %d)",
 	est "Viga faili '%-.64s' lugemisel (veakood: %d)"
 	fre "Erreur en lecture du fichier '%-.64s' (Errcode: %d)"
@@ -599,7 +599,7 @@ ER_ERROR_ON_WRITE
 	cze "Chyba p-B�i z�pisu do souboru '%-.64s' (chybov� k�d: %d)"
 	dan "Fejl ved skriving av filen '%-.64s' (Fejlkode: %d)"
 	nla "Fout bij het wegschrijven van file '%-.64s' (Errcode: %d)"
-	eng "Error writing file '%-.64s' (errno: %d)"
+	eng "Error writing file '%-.200s' (errno: %d)"
 	jps "'%-.64s' �t�@�C�������������ł��܂��� (errno: %d)",
 	est "Viga faili '%-.64s' kirjutamisel (veakood: %d)"
 	fre "Erreur d'�criture du fichier '%-.64s' (Errcode: %d)"
@@ -772,7 +772,7 @@ ER_NOT_FORM_FILE
 	cze "Nespr-B�vn� informace v souboru '%-.64s'"
 	dan "Forkert indhold i: '%-.64s'"
 	nla "Verkeerde info in file: '%-.64s'"
-	eng "Incorrect information in file: '%-.64s'"
+	eng "Incorrect information in file: '%-.200s'"
 	jps "�t�@�C�� '%-.64s' �� info ���Ԉ���Ă���悤�ł�",
 	est "Vigane informatsioon failis '%-.64s'"
 	fre "Information erronn�e dans le fichier: '%-.64s'"
@@ -797,7 +797,7 @@ ER_NOT_KEYFILE
 	cze "Nespr-B�vn� kl�� pro tabulku '%-.64s'; pokuste se ho opravit"
 	dan "Fejl i indeksfilen til tabellen '%-.64s'; pr�v at reparere den"
 	nla "Verkeerde zoeksleutel file voor tabel: '%-.64s'; probeer het te repareren"
-	eng "Incorrect key file for table '%-.64s'; try to repair it"
+	eng "Incorrect key file for table '%-.200s'; try to repair it"
 	jps "'%-.64s' �e�[�u���� key file ���Ԉ���Ă���悤�ł�. �C�������Ă�������",
 	est "Tabeli '%-.64s' v�tmefail on vigane; proovi seda parandada"
 	fre "Index corrompu dans la table: '%-.64s'; essayez de le r�parer"
@@ -2044,7 +2044,7 @@ ER_TEXTFILE_NOT_READABLE
 	cze "Soubor '%-.64s' mus-B� b�t v adres��i datab�ze nebo �iteln� pro v�echny"
 	dan "Filen '%-.64s' skal v�re i database-folderen og kunne l�ses af alle"
 	nla "Het bestand '%-.64s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
-	eng "The file '%-.64s' must be in the database directory or be readable by all"
+	eng "The file '%-.128s' must be in the database directory or be readable by all"
 	jps "�t�@�C�� '%-.64s' �� databse �� directory �ɂ��邩�S�Ẵ��[�U�[���ǂ߂�悤�ɋ��‚���Ă��Ȃ���΂Ȃ�܂���.",
 	est "Fail '%-.64s' peab asuma andmebaasi kataloogis v�i olema k�igile loetav"
 	fre "Le fichier '%-.64s' doit �tre dans le r�pertoire de la base et lisible par tous"
@@ -2069,7 +2069,7 @@ ER_FILE_EXISTS_ERROR
 	cze "Soubor '%-.64s' ji-B� existuje"
 	dan "Filen '%-.64s' eksisterer allerede"
 	nla "Het bestand '%-.64s' bestaat reeds"
-	eng "File '%-.80s' already exists"
+	eng "File '%-.200s' already exists"
 	jps "File '%-.64s' �͊��ɑ��݂��܂�",
 	est "Fail '%-.80s' juba eksisteerib"
 	fre "Le fichier '%-.64s' existe d�j�"
@@ -2345,7 +2345,7 @@ ER_NO_UNIQUE_LOGFILE
 	cze "Nemohu vytvo-B�it jednozna�n� jm�no logovac�ho souboru %s.(1-999)\n"
 	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"
-	eng "Can't generate a unique log-filename %-.64s.(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"
 	fre "Ne peut g�n�rer un unique nom de journal %s.(1-999)\n"
 	ger "Kann keinen eindeutigen Dateinamen f�r die Logdatei %-.64s(1-999) erzeugen\n"
@@ -5218,7 +5218,7 @@ ER_FPARSER_BAD_HEADER
 	rus "�������� ��������� ���� ����� '%-.64s'"
 	ukr "��צ���� ��������� ���� � ���̦ '%-.64s'"
 ER_FPARSER_EOF_IN_COMMENT  
-	eng "Unexpected end of file while parsing comment '%-.64s'"
+	eng "Unexpected end of file while parsing comment '%-.200s'"
 	ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.64s'"
 	rus "����������� ����� ����� � ���������� '%-.64s'"
 	ukr "�����Ħ������ ˦���� ����� � �������Ҧ '%-.64s'"
@@ -5387,7 +5387,7 @@ ER_LOGGING_PROHIBIT_CHANGING_OF
 	eng "Binary logging and replication forbid changing the global server %s"
 	ger "Bin�rlogs und Replikation verhindern Wechsel des globalen Servers %s"
 ER_NO_FILE_MAPPING  
-	eng "Can't map file: %-.64s, errno: %d"
+	eng "Can't map file: %-.200s, errno: %d"
 	ger "Kann Datei nicht abbilden: %-.64s, Fehler: %d"
 ER_WRONG_MAGIC  
 	eng "Wrong magic in %-.64s"