Commit 7770c167 authored by unknown's avatar unknown

Error message consistency edits + updates to affected test results.


mysql-test/r/innodb.result:
  Fix test result to correspond to error message edits.
mysql-test/r/repair_part2.result:
  Fix test result to correspond to error message edits.
mysql-test/r/type_blob.result:
  Fix test result to correspond to error message edits.
sql/share/czech/errmsg.txt:
  Error message consistency edits.
sql/share/dutch/errmsg.txt:
  Error message consistency edits.
sql/share/estonian/errmsg.txt:
  Error message consistency edits.
sql/share/french/errmsg.txt:
  Error message consistency edits.
sql/share/german/errmsg.txt:
  Error message consistency edits.
sql/share/greek/errmsg.txt:
  Error message consistency edits.
sql/share/hungarian/errmsg.txt:
  Error message consistency edits.
sql/share/italian/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian-ny/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian/errmsg.txt:
  Error message consistency edits.
sql/share/danish/errmsg.txt:
  Error message consistency edits.
sql/share/polish/errmsg.txt:
  Error message consistency edits.
sql/share/portuguese/errmsg.txt:
  Error message consistency edits.
sql/share/romanian/errmsg.txt:
  Error message consistency edits.
sql/share/serbian/errmsg.txt:
  Error message consistency edits.
sql/share/slovak/errmsg.txt:
  Error message consistency edits.
sql/share/spanish/errmsg.txt:
  Error message consistency edits.
sql/share/swedish/errmsg.txt:
  Error message consistency edits.
sql/share/ukrainian/errmsg.txt:
  Error message consistency edits.
sql/share/english/errmsg.txt:
  Error message consistency edits.
parent 69764747
......@@ -788,7 +788,7 @@ id id3
UNLOCK TABLES;
DROP TABLE t1;
create table t1 (a char(20), unique (a(5))) type=innodb;
ERROR HY000: Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the store engine doesn't support unique sub keys
ERROR HY000: Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the storage engine doesn't support unique sub keys
create table t1 (a char(20), index (a(5))) type=innodb;
show create table t1;
Table Create Table
......
repair table t1;
Table Op Msg_type Msg_text
test.t1 repair error Can't open file: 't1.MYI'. (errno: 130)
test.t1 repair error Can't open file: 't1.MYI' (errno: 130)
repair table t1 use_frm;
Table Op Msg_type Msg_text
test.t1 repair warning Number of rows changed from 0 to 1
......
......@@ -347,7 +347,7 @@ a 1
hello 1
drop table t1;
create table t1 (a text, key (a(300)));
ERROR HY000: Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the store engine doesn't support unique sub keys
ERROR HY000: Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the storage engine doesn't support unique sub keys
create table t1 (a text, key (a(255)));
drop table t1;
CREATE TABLE t1 (
......
......@@ -44,8 +44,8 @@ v/*
"Obsluha tabulky '%-.64s' nem-B tento parametr",
"Nemohu naj-Bt zznam v '%-.64s'",
"Nespr-Bvn informace v souboru '%-.64s'",
"Nespr-Bvn kl pro tabulku '%-.64s'. Pokuste se ho opravit",
"Star-B klov soubor pro '%-.64s'. Opravte ho.",
"Nespr-Bvn kl pro tabulku '%-.64s'; pokuste se ho opravit",
"Star-B klov soubor pro '%-.64s'; opravte ho.",
"'%-.64s' je jen pro -Bten",
"M-Blo pamti. Pestartujte daemona a zkuste znovu (je poteba %d byt)",
"M-Blo pamti pro tdn. Zvyte velikost tdcho bufferu",
......
......@@ -13,8 +13,8 @@
"Kan ikke oprette databasen '%-.64s' (Fejlkode: %d)",
"Kan ikke oprette databasen '%-.64s'; databasen eksisterer",
"Kan ikke slette (droppe) '%-.64s'; databasen eksisterer ikke",
"Fejl ved sletning (drop) af databasen (kan ikke slette '%-.64s', Fejl %d)",
"Fejl ved sletting af database (kan ikke slette folderen '%-.64s', Fejl %d)",
"Fejl ved sletning (drop) af databasen (kan ikke slette '%-.64s', Fejlkode %d)",
"Fejl ved sletting af database (kan ikke slette folderen '%-.64s', Fejlkode %d)",
"Fejl ved sletning af '%-.64s' (Fejlkode: %d)",
"Kan ikke læse posten i systemfolderen",
"Kan ikke læse status af '%-.64s' (Fejlkode: %d)",
......@@ -38,8 +38,8 @@
"Denne mulighed eksisterer ikke for tabeltypen '%-.64s'",
"Kan ikke finde posten i '%-.64s'",
"Forkert indhold i: '%-.64s'",
"Fejl i indeksfilen til tabellen '%-.64s', prøv at reparere den",
"Gammel indeksfil for tabellen '%-.64s'; Reparer den",
"Fejl i indeksfilen til tabellen '%-.64s'; prøv at reparere den",
"Gammel indeksfil for tabellen '%-.64s'; reparer den",
"'%-.64s' er skrivebeskyttet",
"Ikke mere hukommelse. Genstart serveren og prøv igen (mangler %d bytes)",
"Ikke mere sorteringshukommelse. Øg sorteringshukommelse (sort buffer size) for serveren",
......
......@@ -46,8 +46,8 @@
"Tabel handler voor '%-.64s' heeft deze optie niet",
"Kan record niet vinden in '%-.64s'",
"Verkeerde info in file: '%-.64s'",
"Verkeerde zoeksleutel file voor tabel: '%-.64s'. Probeer het te repareren",
"Oude zoeksleutel file voor tabel '%-.64s'; Repareer het!",
"Verkeerde zoeksleutel file voor tabel: '%-.64s'; probeer het te repareren",
"Oude zoeksleutel file voor tabel '%-.64s'; repareer het!",
"'%-.64s' is alleen leesbaar",
"Geen geheugen meer. Herstart server en probeer opnieuw (%d bytes nodig)",
"Geen geheugen om te sorteren. Verhoog de server sort buffer size",
......
......@@ -35,8 +35,8 @@
"Table storage engine for '%-.64s' doesn't have this option",
"Can't find record in '%-.64s'",
"Incorrect information in file: '%-.64s'",
"Incorrect key file for table: '%-.64s'. Try to repair it",
"Old key file for table '%-.64s'; Repair it!",
"Incorrect key file for table: '%-.64s'; try to repair it",
"Old key file for table '%-.64s'; repair it!",
"Table '%-.64s' is read only",
"Out of memory. Restart daemon and try again (needed %d bytes)",
"Out of sort memory. Increase daemon sort buffer size",
......@@ -90,7 +90,7 @@
"File '%-.80s' already exists",
"Records: %ld Deleted: %ld Skipped: %ld Warnings: %ld",
"Records: %ld Duplicates: %ld",
"Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the store engine doesn't support unique sub keys",
"Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the storage engine doesn't support unique sub keys",
"You can't delete all columns with ALTER TABLE. Use DROP TABLE instead",
"Can't DROP '%-.64s'. Check that column/key exists",
"Records: %ld Duplicates: %ld Warnings: %ld",
......@@ -186,7 +186,7 @@
"Got error %d during FLUSH_LOGS",
"Got error %d during CHECKPOINT",
"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
"The store engine for the table does not support binary table dump",
"The storage engine for the table does not support binary table dump",
"Binlog closed, cannot RESET MASTER",
"Failed rebuilding the index of dumped table '%-.64s'",
"Error from master: '%-.64s'",
......
......@@ -40,8 +40,8 @@
"Tabeli '%-.64s' handler ei toeta antud operatsiooni",
"Ei suuda leida kirjet '%-.64s'-s",
"Vigane informatsioon failis '%-.64s'",
"Tabeli '%-.64s' vtmefail on vigane; Proovi seda parandada",
"Tabeli '%-.64s' vtmefail on aegunud; Paranda see!",
"Tabeli '%-.64s' vtmefail on vigane; proovi seda parandada",
"Tabeli '%-.64s' vtmefail on aegunud; paranda see!",
"Tabel '%-.64s' on ainult lugemiseks",
"Mlu sai otsa. Proovi MySQL uuesti kivitada (puudu ji %d baiti)",
"Mlu sai sorteerimisel otsa. Suurenda MySQL-i sorteerimispuhvrit",
......
......@@ -35,8 +35,8 @@
"Le handler de la table '%-.64s' n'a pas cette option",
"Ne peut trouver l'enregistrement dans '%-.64s'",
"Information erronnée dans le fichier: '%-.64s'",
"Index corrompu dans la table: '%-.64s'. Essayez de le réparer",
"Vieux fichier d'index pour la table '%-.64s'; Réparez le!",
"Index corrompu dans la table: '%-.64s'; essayez de le réparer",
"Vieux fichier d'index pour la table '%-.64s'; réparez le!",
"'%-.64s' est en lecture seulement",
"Manque de mémoire. Redémarrez le démon et ré-essayez (%d octets nécessaires)",
"Manque de mémoire pour le tri. Augmentez-la.",
......
......@@ -28,25 +28,25 @@
"Datei nicht sperrbar. (Fehler: %d)",
"Kann Datei '%-.64s' nicht öffnen (Fehler: %d)",
"Kann Datei '%-.64s' nicht finden (Fehler: %d)",
"Verzeichnis von '%-.64s' nicht lesbar. (Fehler: %d)",
"Kann nicht in das Verzeichnis '%-.64s' wechseln. (Fehler: %d)",
"Datensatz hat sich seit dem letzten Zugriff auf Tabelle '%-.64s' geändert.",
"Verzeichnis von '%-.64s' nicht lesbar (Fehler: %d)",
"Kann nicht in das Verzeichnis '%-.64s' wechseln (Fehler: %d)",
"Datensatz hat sich seit dem letzten Zugriff auf Tabelle '%-.64s' geändert",
"Festplatte voll (%-.64s). Warte bis jemand Platz schafft ...",
"Kann nicht speichern, doppelter Schlüssel in Tabelle '%-.64s'.",
"Fehler beim Schließen von '%-.64s'. (Fehler: %d)",
"Fehler beim Lesen der Datei '%-.64s'. (Fehler: %d)",
"Fehler beim Umbenennen von '%-.64s' nach '%-.64s'. (Fehler: %d)",
"Fehler beim Speichern der Datei '%-.64s'. (Fehler: %d)",
"'%-.64s' ist für Veränderungen gesperrt.",
"Sortieren abgebrochen.",
"View '%-.64s' existiert für '%-.64s' nicht.",
"Fehler %d. (Tabellenhandler)",
"Diese Option gibt es nicht. (Tabellenhandler)",
"Kann Datensatz nicht finden.",
"Kann nicht speichern, doppelter Schlüssel in Tabelle '%-.64s'",
"Fehler beim Schließen von '%-.64s' (Fehler: %d)",
"Fehler beim Lesen der Datei '%-.64s' (Fehler: %d)",
"Fehler beim Umbenennen von '%-.64s' nach '%-.64s' (Fehler: %d)",
"Fehler beim Speichern der Datei '%-.64s' (Fehler: %d)",
"'%-.64s' ist für Veränderungen gesperrt",
"Sortieren abgebrochen",
"View '%-.64s' existiert für '%-.64s' nicht",
"Fehler %d (Tabellenhandler)",
"Diese Option gibt es nicht (Tabellenhandler)",
"Kann Datensatz nicht finden",
"Falsche Information in Datei: '%-.64s'",
"Falsche Schlüssel-Datei für Tabelle '%-.64s'. Versuche zu reparieren!",
"Alte Schlüssel-Datei für Tabelle '%-.64s'. Repariere!",
"'%-.64s' ist nur lesbar.",
"Falsche Schlüssel-Datei für Tabelle '%-.64s'; versuche zu reparieren!",
"Alte Schlüssel-Datei für Tabelle '%-.64s'; repariere!",
"'%-.64s' ist nur lesbar",
"Kein Speicher vorhanden (benötigt %d bytes). Server neu starten.",
"Kein Speicher zum Sortieren. sort_buffer_size sollte erhöht werden.",
"Unerwartetes Ende beim Lesen der Datei '%-.64s'. (Fehler: %d)",
......
......@@ -35,7 +35,7 @@
" (table handler) '%-.64s' ",
" '%-.64s'",
" : '%-.64s'",
" (key file) : '%-.64s'. , !",
" (key file) : '%-.64s'; , !",
" (key file) '%-.64s'; , !",
"'%-.64s' ",
" . , (demon) ( %d bytes)",
......
......@@ -37,8 +37,8 @@
"A(z) '%-.64s' tablakezelonek nincs ilyen opcioja",
"Nem talalhato a rekord '%-.64s'-ben",
"Ervenytelen info a file-ban: '%-.64s'",
"Ervenytelen kulcsfile a tablahoz: '%-.64s'. Probalja kijavitani!",
"Regi kulcsfile a '%-.64s'tablahoz; Probalja kijavitani!",
"Ervenytelen kulcsfile a tablahoz: '%-.64s'; probalja kijavitani!",
"Regi kulcsfile a '%-.64s'tablahoz; probalja kijavitani!",
"'%-.64s' irasvedett",
"Nincs eleg memoria. Inditsa ujra a demont, es probalja ismet. (%d byte szukseges.)",
"Nincs eleg memoria a rendezeshez. Novelje a rendezo demon puffermeretet",
......
......@@ -35,8 +35,8 @@
"Il gestore delle tabelle per '%-.64s' non ha questa opzione",
"Impossibile trovare il record in '%-.64s'",
"Informazione errata nel file: '%-.64s'",
"File chiave errato per la tabella : '%-.64s'. Prova a riparalo",
"File chiave vecchio per la tabella '%-.64s'; Riparalo!",
"File chiave errato per la tabella : '%-.64s'; prova a riparalo",
"File chiave vecchio per la tabella '%-.64s'; riparalo!",
"'%-.64s' e` di sola lettura",
"Memoria esaurita. Fai ripartire il demone e riprova (richiesti %d bytes)",
"Memoria per gli ordinamenti esaurita. Incrementare il 'sort_buffer' al demone",
......
......@@ -37,8 +37,8 @@
"Tabell hndteraren for '%-.64s' har ikkje denne moglegheita",
"Kan ikkje finne posten i '%-.64s'",
"Feil informasjon i fila: '%-.64s'",
"Tabellen '%-.64s' har feil i nykkelfila, Prv reparere den",
"Gammel nykkelfil for tabellen '%-.64s'; Reparer den!",
"Tabellen '%-.64s' har feil i nykkelfila; prv reparere den",
"Gammel nykkelfil for tabellen '%-.64s'; reparer den!",
"'%-.64s' er skrivetryggja",
"Ikkje meir minne. Start p nytt tenesten og prv igjen (trengte %d bytar)",
"Ikkje meir sorteringsminne. Auk sorteringsminnet (sorteringsbffer storleik) for tenesten",
......
......@@ -37,8 +37,8 @@
"Tabell håndtereren for '%-.64s' har ikke denne muligheten",
"Kan ikke finne posten i '%-.64s'",
"Feil informasjon i filen: '%-.64s'",
"Tabellen '%-.64s' har feil i nøkkelfilen, forsøk å reparer den",
"Gammel nøkkelfil for tabellen '%-.64s'; Reparer den!",
"Tabellen '%-.64s' har feil i nøkkelfilen; forsøk å reparer den",
"Gammel nøkkelfil for tabellen '%-.64s'; reparer den!",
"'%-.64s' er skrivebeskyttet",
"Ikke mer minne. Star på nytt tjenesten og prøv igjen (trengte %d byter)",
"Ikke mer sorteringsminne. Øk sorteringsminnet (sort buffer size) for tjenesten",
......
......@@ -39,8 +39,8 @@
"Obsuga tabeli '%-.64s' nie posiada tej opcji",
"Nie mona znale rekordu w '%-.64s'",
"Niewa?ciwa informacja w pliku: '%-.64s'",
"Niewa?ciwy plik kluczy dla tabeli: '%-.64s'. Sprbuj go naprawi",
"Plik kluczy dla tabeli '%-.64s' jest starego typu; Napraw go!",
"Niewa?ciwy plik kluczy dla tabeli: '%-.64s'; sprbuj go naprawi",
"Plik kluczy dla tabeli '%-.64s' jest starego typu; napraw go!",
"'%-.64s' jest tylko do odczytu",
"Zbyt mao pamici. Uruchom ponownie demona i sprbuj ponownie (potrzeba %d bajtw)",
"Zbyt mao pamici dla sortowania. Zwiksz wielko? bufora demona dla sortowania",
......
......@@ -35,8 +35,8 @@
"Manipulador de tabela para '%-.64s' não tem esta opção",
"Não pode encontrar registro em '%-.64s'",
"Informação incorreta no arquivo '%-.64s'",
"Arquivo de índice incorreto para tabela '%-.64s'. Tente repará-lo",
"Arquivo de índice desatualizado para tabela '%-.64s'. Repare-o!",
"Arquivo de índice incorreto para tabela '%-.64s'; tente repará-lo",
"Arquivo de índice desatualizado para tabela '%-.64s'; repare-o!",
"Tabela '%-.64s' é somente para leitura",
"Sem memória. Reinicie o programa e tente novamente (necessita de %d bytes)",
"Sem memória para ordenação. Aumente tamanho do 'buffer' de ordenação",
......
......@@ -39,8 +39,8 @@
"Handlerul tabelei pentru '%-.64s' nu are aceasta optiune",
"Nu pot sa gasesc recordul in '%-.64s'",
"Informatie incorecta in fisierul: '%-.64s'",
"Cheia fisierului incorecta pentru tabela: '%-.64s'. Incearca s-o repari",
"Cheia fisierului e veche pentru tabela '%-.64s'; Repar-o!",
"Cheia fisierului incorecta pentru tabela: '%-.64s'; incearca s-o repari",
"Cheia fisierului e veche pentru tabela '%-.64s'; repar-o!",
"Tabela '%-.64s' e read-only",
"Out of memory. Porneste daemon-ul din nou si incearca inca o data (e nevoie de %d bytes)",
"Out of memory pentru sortare. Largeste marimea buffer-ului pentru sortare in daemon (sort buffer size)",
......
......@@ -41,8 +41,8 @@
"Handler tabela za '%-.64s' nema ovu opciju",
"Ne mogu da pronaem slog u '%-.64s'",
"Pogrena informacija u file-u: '%-.64s'",
"Pogrean key file za tabelu: '%-.64s'. Probajte da ga ispravite",
"Zastareo key file za tabelu '%-.64s'; Ispravite ga",
"Pogrean key file za tabelu: '%-.64s'; probajte da ga ispravite",
"Zastareo key file za tabelu '%-.64s'; ispravite ga",
"Tabelu '%-.64s' je dozvoljeno samo itati",
"Nema memorije. Restartujte MySQL server i probajte ponovo (potrebno je %d byte-ova)",
"Nema memorije za sortiranje. Poveajte veliinu sort buffer-a MySQL server-u",
......
......@@ -43,8 +43,8 @@
"Obsluha tabuky '%-.64s' nem tento parameter",
"Nemem njs zznam v '%-.64s'",
"Nesprvna informcia v sbore: '%-.64s'",
"Nesprvny k pre tabuku '%-.64s'. Pokste sa ho opravi",
"Star kov sbor pre '%-.64s'; Opravte ho!",
"Nesprvny k pre tabuku '%-.64s'; pokste sa ho opravi",
"Star kov sbor pre '%-.64s'; opravte ho!",
"'%-.64s' is ta only",
"Mlo pamti. Retartujte daemona a skste znova (je potrebnch %d bytov)",
"Mlo pamti pre triedenie, zvte vekos triediaceho bufferu",
......
......@@ -36,8 +36,8 @@
"El manejador de la tabla de '%-.64s' no tiene esta opcion",
"No puedo encontrar el registro en '%-.64s'",
"Informacion erronea en el archivo: '%-.64s'",
"Clave de archivo erronea para la tabla: '%-.64s'. Intente repararlo",
"Clave de archivo antigua para la tabla '%-.64s'; Reparelo!",
"Clave de archivo erronea para la tabla: '%-.64s'; intente repararlo",
"Clave de archivo antigua para la tabla '%-.64s'; reparelo!",
"'%-.64s' es de solo lectura",
"Memoria insuficiente. Reinicie el demonio e intentelo otra vez (necesita %d bytes)",
"Memoria de ordenacion insuficiente. Incremente el tamano del buffer de ordenacion",
......
......@@ -35,8 +35,8 @@
"Registrets databas har inte denna facilitet",
"Hittar inte posten",
"Felaktig fil: '%-.64s'",
"Fatalt fel vid hantering av register '%-.64s'. Kör en reparation",
"Gammal nyckelfil '%-.64s'. Reparera registret",
"Fatalt fel vid hantering av register '%-.64s'; kör en reparation",
"Gammal nyckelfil '%-.64s'; reparera registret",
"'%-.64s' är skyddad mot förändring",
"Oväntat slut på minnet, starta om programmet och försök på nytt (Behövde %d bytes)",
"Sorteringsbufferten räcker inte till. Kontrollera startparametrarna",
......
......@@ -40,7 +40,7 @@
" æ '%-.64s' æ Ԧ",
" '%-.64s'",
" æ ̦: '%-.64s'",
" æ: '%-.64s'. צ",
" æ: '%-.64s'; צ",
" æ '%-.64s'; צ !",
" '%-.64s' Ԧ ",
" 'Ԧ. (Ҧ %d Ԧ)",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment