Fix error messages after merge from 3.23

include/mysqld_error.h

@@ -211,10 +211,10 @@
 #define ER_DROP_DB_WITH_READ_LOCK 1208
 #define ER_CREATE_DB_WITH_READ_LOCK 1209
 #define ER_WRONG_ARGUMENTS 1210
-#define ER_CONNECT_TO_MASTER 1211
-#define ER_QUERY_ON_MASTER 1212
-#define ER_ERROR_WHEN_EXECUTING_COMMAND 1213
-#define ER_WRONG_USAGE 1214
-#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215
-#define ER_NO_PERMISSION_TO_CREATE_USER 1216
+#define ER_NO_PERMISSION_TO_CREATE_USER 1211
+#define ER_CONNECT_TO_MASTER 1212
+#define ER_QUERY_ON_MASTER 1213
+#define ER_ERROR_WHEN_EXECUTING_COMMAND 1214
+#define ER_WRONG_USAGE 1215
+#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1216
 #define ER_ERROR_MESSAGES 217

mysql-test/t/fulltext.test

@@ -73,11 +73,12 @@ CREATE TABLE t3 (
 );
 
 --error 1210
-select * from t2 having MATCH inhalt AGAINST (t1.id);
+select * from t2 where MATCH inhalt AGAINST (t2.inhalt);
 --error 1210
-select * from t2 having MATCH ticket AGAINST ('foobar');
+select * from t2 where MATCH inhalt AGAINST (t2.inhalt);
+--error 1191
+select * from t2 where MATCH ticket AGAINST ('foobar');
 --error 1210
-select * from t2,t3 having MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
+select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
 
 drop table t1,t2,t3;
-

mysql-test/t/union.test

@@ -19,11 +19,13 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g
 explain select a,b from t1 union all select a,b from t2;
 
 # Test some error conditions with UNION
---error 1214
+--error 1215
 select a,b from t1 into outfile 'skr' union select a,b from t2;
---error 1214
-select a,b from t1 order by a union select a,b from t2;
+
 --error 1215
+select a,b from t1 order by a union select a,b from t2;
+
+--error 1216
 select a,b from t1 union select a from t2;
 create table t3 select a,b from t1 union all select a,b from t2;
 insert into t3 select a,b from t1 union all select a,b from t2;

sql/share/czech/errmsg.txt

@@ -221,9 +221,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/danish/errmsg.txt

@@ -2,29 +2,29 @@
    This file is public domain and comes with NO WARRANTY of any kind */
 
 /* Knud Riishøjgård knudriis@post.tele.dk 99 &&
-   Carsten H. Pedersen, carsten.pedersen@bitbybit.dk oct. 1999 */
+   Carsten H. Pedersen, carsten.pedersen@bitbybit.dk oct. 1999 / aug. 2001. */
 
 "hashchk",
 "isamchk",
 "NEJ",
 "JA",
 "Kan ikke oprette filen '%-.64s' (Fejlkode: %d)",
-"Kan ikke opprette tabellen '%-.64s' (Fejlkode: %d)",
+"Kan ikke oprette tabellen '%-.64s' (Fejlkode: %d)",
 "Kan ikke oprette databasen '%-.64s'. Fejl %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 biblioteket '%-.64s', Fejl %d)",
+"Fejl ved sletting af database (kan ikke slette folderen '%-.64s', Fejl %d)",
 "Fejl ved sletning af '%-.64s' (Fejlkode: %d)",
-"Kan ikke læse posten i systembiblioteket",
+"Kan ikke læse posten i systemfolderen",
 "Kan ikke læse status af '%-.64s' (Fejlkode: %d)",
-"Kan ikke læse aktive bibliotek (Fejlkode: %d)",
+"Kan ikke læse aktive folder (Fejlkode: %d)",
 "Kan ikke låse fil (Fejlkode: %d)",
 "Kan ikke åbne fil: '%-.64s'. (Fejlkode: %d)",
 "Kan ikke finde fila: '%-.64s' (Fejlkode: %d)",
-"Kan ikke læse bibliotek '%-.64s' (Fejlkode: %d)",
-"Kan ikke skifte bibliotek til '%-.64s' (Fejlkode: %d)",
-"Posten erændret siden sidst læst '%-.64s'",
+"Kan ikke læse folder '%-.64s' (Fejlkode: %d)",
+"Kan ikke skifte folder til '%-.64s' (Fejlkode: %d)",
+"Posten er ændret siden sidste læsning '%-.64s'",
 "Ikke mere diskplads (%s). Venter på at få frigjort plads....",
 "Kan ikke skrive, flere ens nøgler i tabellen '%-.64s'",
 "Fejl ved lukning af '%-.64s' (Fejlkode: %d)",
@@ -32,10 +32,10 @@
 "Fejl ved omdøbning af '%-.64s' til '%-.64s' (Fejlkode: %d)",
 "Fejl ved skriving av filen '%-.64s' (Fejlkode: %d)",
 "'%-.64s' er låst mod opdateringer",
-"Sortering afbrutt",
+"Sortering afbrudt",
 "View '%-.64s' eksisterer ikke for '%-.64s'",
-"Modtog fejl %d fra tabel håndterer",
-"Tabel håndtereren for '%-.64s' har ikke denne mulighed",
+"Modtog fejl %d fra tabel håndteringen",
+"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",
@@ -43,95 +43,95 @@
 "'%-.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",
-"Uventet sluttning af fil (eof) ved læsning af filen '%-.64s' (Fejlkode: %d)",
-"For mange tilkoblinger (connections)",
+"Uventet afslutning på fil (eof) ved læsning af filen '%-.64s' (Fejlkode: %d)",
+"For mange forbindelser (connections)",
 "Udgået for tråde/hukommelse",
 "Kan ikke få værtsnavn for din adresse",
 "Forkert håndtryk (handshake)",
 "Adgang nægtet bruger: '%-.32s@%-.64s' til databasen '%-.64s'",
-"Adgang nægtet bruger: '%-.32s@%-.64s' (Bruger password: %s)",
+"Adgang nægtet bruger: '%-.32s@%-.64s' (Bruger adgangskode: %s)",
 "Ingen database valgt",
 "Ukendt kommando",
-"Kolonne '%-.64s' kan ikke være nul",
+"Kolonne '%-.64s' kan ikke være NULL",
 "Ukendt database '%-.64s'",
-"Tabellen '%-.64s' eksisterer allerede",
+"Tabellen '%-.64s' findes allerede",
 "Ukendt tabel '%-.64s'",
 "Felt: '%-.64s' i tabel %s er ikke entydigt",
-"Database nedkobling er i gang",
+"Database nedlukning er i gang",
 "Ukendt kolonne '%-.64s' i tabel %s",
-"Grugte '%-.64s' som ikke var i group by",
+"Brugte '%-.64s' som ikke var i group by",
 "Kan ikke gruppere på '%-.64s'",
 "Udtrykket har summer (sum) funktioner og kolonner i samme udtryk",
-"Kolonne tæller stemmer ikke med værditæller",
-"Identifikationen '%-.64s' er for lang",
-"Feltnavnet '%-.64s' eksisterer allerede",
-"Indeksnavnet '%-.64s' eksisterer allerede",
+"Kolonne tæller stemmer ikke med antallet af værdier",
+"Navnet '%-.64s' er for langt",
+"Feltnavnet '%-.64s' findes allerede",
+"Indeksnavnet '%-.64s' findes allerede",
 "Ens værdier '%-.64s' for indeks %d",
 "Forkert kolonnespecifikaton for felt '%-.64s'",
 "%s nær '%-.64s' på linje %d",
 "Forespørgsel var tom",
-"Ikke unikt tabel/alias: '%-.64s'",
+"Tabellen/aliaset: '%-.64s' er ikke unikt",
 "Ugyldig standardværdi for '%-.64s'",
-"Flere primærindekser specificeret",
-"For mange indekser specificeret. Maks %d indekser tillatt",
-"For mange indeksdele specificeret. Maks %d dele tillatt",
-"Specificeret indeks var for langt. Maks indekslængde er %d",
-"Indeks felt '%-.64s' eksiterer ikke i tabellen",
-"Blob felt '%-.64s' kan ikke bruges ved specifikation af indeks",
+"Flere primærnøgler specificeret",
+"For mange nøgler specificeret. Kun %d nøgler må bruges",
+"For mange nøgledele specificeret. Kun %d dele må bruges",
+"Specificeret nøgle var for lang. Maksimal nøglelængde er %d",
+"Nøglefeltet '%-.64s' eksisterer ikke i tabellen",
+"BLOB feltet '%-.64s' kan ikke bruges ved specifikation af indeks",
 "For stor feltlængde for kolonne '%-.64s' (maks = %d). Brug BLOB i stedet",
-"Der kan kun bruges eet AUTO-felt og det skal være indekseret",
-"%s: klar for tilslutninger\n",
+"Der kan kun specificeres eet AUTO_INCREMENT-felt, og det skal være indekseret",
+"%s: klar til tilslutninger\n",
 "%s: Normal nedlukning\n",
-"%s: Opdaget signal %d. Afslutter!!\n",
+"%s: Fangede signal %d. Afslutter!!\n",
 "%s: Server lukket\n",
 "%s: Forceret nedlukning af tråd: %ld  bruger: '%-.64s'\n",
 "Kan ikke oprette IP socket",
-"Tabellen '%-.64s' har intet indeks som det der er brugt i CREATE INDEX. Genopret tabellen",
+"Tabellen '%-.64s' har ikke den nøgle, som blev brugt i CREATE INDEX. Genopret tabellen",
 "Felt adskiller er ikke som forventet, se dokumentationen",
 "Man kan ikke bruge faste feltlængder med BLOB. Brug i stedet 'fields terminated by'.",
-"Filen '%-.64s' skal være i database-biblioteket for at kunne læses af alle",
+"Filen '%-.64s' skal være i database-folderen og kunne læses af alle",
 "Filen '%-.64s' eksisterer allerede",
 "Poster: %ld  Fjernet: %ld  Sprunget over: %ld  Advarsler: %ld",
 "Poster: %ld  Ens: %ld",
-"Forkert indeksdel. Den anvendte indeksdel er ikke en streng eller den længden er større end indekslængden",
+"Forkert indeksdel. Den anvendte nøgledel er ikke en streng eller længden er større end nøglelængden",
 "Man kan ikke slette alle felter med ALTER TABLE. Brug DROP TABLE i stedet.",
-"Kan ikke DROP '%-.64s'. Undersøg om felt/indeks eksisterer.",
+"Kan ikke udføre DROP '%-.64s'. Undersøg om feltet/nøglen eksisterer.",
 "Poster: %ld  Ens: %ld  Advarsler: %ld",
 "INSERT TABLE '%-.64s' er ikke tilladt i FROM tabel liste",
 "Ukendt tråd id: %lu",
-"Du er ikke ejer av tråden %lu",
+"Du er ikke ejer af tråden %lu",
 "Ingen tabeller i brug",
-"For mange tekststrenge kolonne %s og SET",
-"Kan ikke lave unikt loggfilnavn %s.(1-999)\n",
+"For mange tekststrenge til specifikationen af SET i kolonne %-.64s",
+"Kan ikke lave unikt log-filnavn %s.(1-999)\n",
 "Tabellen '%-.64s' var låst med READ lås og kan ikke opdateres",
 "Tabellen '%-.64s' var ikke låst med LOCK TABLES",
-"Blob feltet '%-.64s' kan ikke have en standard værdi",
+"BLOB feltet '%-.64s' kan ikke have en standard værdi",
 "Ugyldigt database navn '%-.64s'",
 "Ugyldigt tabel navn '%-.64s'",
-"SELECT ville undersøge for mange poster og ville sannsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET OPTION SQL_BIG_SELECTS=1 hvis SELECTen er korrekt"
+"SELECT ville undersøge for mange poster og ville sandsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET OPTION SQL_BIG_SELECTS=1 hvis udtrykket er korrekt"
 "Ukendt fejl",
 "Ukendt procedure %s",
 "Forkert antal  parametre til proceduren %s",
 "Forkert(e) parametre til proceduren %s",
 "Ukendt tabel '%-.64s' i %s",
-"Feltet '%-.64s' er anvendt to ganger",
-"Forkert brug af gruppe-funktion",
-"Tabellen '%-.64s' bruger et efternavn som ikke findes i denne MySQL version",
+"Feltet '%-.64s' er anvendt to gange",
+"Forkert brug af grupperings-funktion",
+"Tabellen '%-.64s' bruger et filtypenavn som ikke findes i denne MySQL version",
 "En tabel skal have mindst een kolonne",
 "Tabellen '%-.64s' er fuld",
-"Ukendt karaktersæt: '%-.64s'",
+"Ukendt tegnsæt: '%-.64s'",
 "For mange tabeller. MySQL kan kun bruge %d tabeller i et join",
 "For mange felter",
-"For store poster. Max post størrelse, unde BOLB's, er %d. Du må lave nogle felter til BLOB's",
+"For store poster. Max post størrelse, uden BLOB's, er %d. Du må lave nogle felter til BLOB's",
 "Thread stack brugt:  Brugt: %ld af en %ld stak.  Brug 'mysqld -O thread_stack=#' for at allokere en større stak om nødvendigt",
 "Krydsreferencer fundet i OUTER JOIN.  Check dine ON conditions",
 "Kolonne '%-.32s' bruges som UNIQUE eller INDEX men er ikke defineret som NOT NULL",
 "Kan ikke læse funktionen '%-.64s'",
 "Kan ikke starte funktionen '%-.64s'; %-.80s",
-"Ingen sti tilladte for delt bibliotek",
+"Angivelse af sti ikke tilladt for delt bibliotek",
 "Funktionen '%-.64s' findes allerede",
 "Kan ikke åbne delt bibliotek '%-.64s' (errno: %d %s)",
-"Kan ikke finde funktionen '%-.64s' in bibliotek'",
+"Kan ikke finde funktionen '%-.64s' i bibliotek'",
 "Funktionen '%-.64s' er ikke defineret",
 "Værten er blokeret på grund af mange fejlforespørgsler. Lås op med 'mysqladmin flush-hosts'",
 "Værten '%-.64s' kan ikke tilkoble denne MySQL-server",
@@ -139,7 +139,7 @@
 "Du skal have tilladelse til at opdatere tabeller i MySQL databasen for at ændre andres adgangskoder",
 "Kan ikke finde nogen tilsvarende poster i bruger tabellen",
 "Poster fundet: %ld  Ændret: %ld  Advarsler: %ld",
-"Kan ikke danne en ny tråd (thread) (errno %d). Hvis computeren ikke er løbet tør for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afhængig fejl",
+"Kan ikke danne en ny tråd (fejl nr. %d). Hvis computeren ikke er løbet tør for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afhængig fejl",
 "Kolonne antallet stemmer ikke overens med antallet af værdier i post %ld",
 "Kan ikke genåbne tabel '%-.64s',
 "Forkert brug af nulværdi (NULL)",
@@ -171,53 +171,53 @@
 "Denne tabeltype understøtter ikke brug af AUTO_INCREMENT kolonner",
 "INSERT DELAYED kan ikke bruges med tabellen '%-.64s', fordi tabellen er låst med LOCK TABLES",
 "Forkert kolonnenavn '%-.100s'",
-"Den brugte tabel styrer kan ikke indeksere kolonnen '%-.64s'",
+"Den brugte tabeltype kan ikke indeksere kolonnen '%-.64s'",
 "Tabellerne i MERGE er ikke defineret ens",
 "Kan ikke skrive til tabellen '%-.64s' fordi det vil bryde CONSTRAINT regler",
-"BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
-"Result consisted of more than one row",
-"This table type requires a primary key",
-"This version of MySQL is not compiled with RAID support",
-"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
-"Key '%-.64s' doesn't exist in table '%-.64s'",
-"Can't open table",
-"The handler for the table doesn't support check/repair",
-"You are not allowed to execute this command in a transaction",
-"Got error %d during COMMIT",
-"Got error %d during ROLLBACK",
-"Got error %d during FLUSH_LOGS",
-"Got error %d during CHECKPOINT",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
-"The handler for the table does not support binary table dump",
-"Binlog closed while trying to FLUSH MASTER",
-"Failed rebuilding the index of dumped table '%-.64s'",
-"Error from master: '%-.64s'",
-"Net error reading from master",
-"Net error writing to master",
-"Can't find FULLTEXT index matching the column list",
-"Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
-"Table '%-.64s' is marked as crashed and should be repaired",
-"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
-"This operation cannot be performed with a running slave, run SLAVE STOP first",
-"This operation requires a running slave, configure slave and do SLAVE START",
-"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
-"Could not initialize master info structure, check permisions on master.info",
-"Could not create slave thread, check system resources",
-"User %-.64s has already more than 'max_user_connections' active connections",
-"You may only use constant expressions with SET",
-"Lock wait timeout exceeded",
-"The total number of locks exceeds the lock table size",
-"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"DROP DATABASE not allowed while thread is holding global read lock",
-"CREATE DATABASE not allowed while thread is holding global read lock",
+"BLOB kolonnen '%-.64s' brugt i nøglespecifikation uden nøglelængde",
+"Alle dele af en PRIMARY KEY skal være NOT NULL;  Hvis du skal bruge NULL i nøglen, brug UNIQUE istedet",
+"Resultatet bestod af mere end een række",
+"Denne tabeltype kræver en primærnøgle",
+"Denne udgave af MySQL er ikke oversat med understøttelse af RAID",
+"Du bruger sikker opdaterings modus ('safe update mode') og du forsøgte at opdatere en tabel uden en WHERE klausul, der gør brug af et KEY felt",
+"Nøglen '%-.64s' eksisterer ikke i tabellen '%-.64s'",
+"Kan ikke åbne tabellen",
+"Denne tabeltype understøtter ikke CHECK/REPAIR",
+"Du må ikke bruge denne kommando i en transaktion",
+"Modtog fejl %d mens kommandoen COMMIT blev udført",
+"Modtog fejl %d mens kommandoen ROLLBACK blev udført",
+"Modtog fejl %d mens kommandoen FLUSH_LOGS blev udført",
+"Modtog fejl %d mens kommandoen CHECKPOINT blev udført",
+"Afbrød forbindelsen %ld til databasen '%-.64s' bruger: '%-.32s' vært: `%-.64s' (%-.64s)",
+"Denne tabeltype unserstøtter ikke binært tabeldump",
+"Binlog blev lukket mens kommandoen FLUSH MASTER blev udført",
+"Kunne ikke genopbygge indekset for den dumpede tabel '%-.64s'",
+"Fejl fra master: '%-.64s'",
+"Netværksfejl ved læsning fra master",
+"Netværksfejl ved skrivning til master",
+"Kan ikke finde en FULLTEXT nøgle som svarer til kolonne listen",
+"Kan ikke udføre den givne kommando fordi der findes aktive, låste tabeller eller fordi der udføres en transaktion",
+"Ukendt systemvariabel '%-.64'",
+"Tabellen '%-.64s' er markeret med fejl og bør repareres",
+"Tabellen '%-.64s' er markeret med fejl og sidste (automatiske?) REPAIR fejlede",
+"Advarsel: Visse data i tabeller der ikke understøtter transaktioner kunne ikke tilbagestilles",
+"Fler-udtryks transaktion krævede mere plads en 'max_binlog_cache_size' bytes. Forhøj værdien af denne variabel og prøv igen',
+"Denne handling kunne ikke udføres med kørende slave, brug først kommandoen SLAVE STOP",
+"Denne handling kræver en kørende slave. Konfigurer en slave og brug kommandoen SLAVE START",
+"Denne server er ikke konfigureret som slave. Ret in config-filen eller brug kommandoen CHANGE MASTER TO",
+"Kunne ikke initialisere master info-struktur. Check om rettigheder i master.info",
+"Kunne ikke danne en slave-tråd. Check systemressourcerne",
+"Brugeren %-.64s har allerede mere end 'max_user_connections' aktive forbindelser",
+"Du må kun bruge konstantudtryk med SET",
+"Lock wait timeout overskredet",
+"Det totale antal låse overstiger størrelsen på låse-tabellen",
+"Update lås kan ikke opnås under en READ UNCOMMITTED transaktion",
+"DROP DATABASE er ikke tilladt mens en tråd holder på globalt read lock",
+"CREATE DATABASE er ikke tilladt mens en tråd holder på globalt read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/dutch/errmsg.txt

 /* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
-   This file is public domain and comes with NO WARRANTY of any kind */
+   This file is public domain and comes with NO WARRANTY of any kind
+
+   Dutch error messages (share/dutch/errmsg.txt)
+   Arjen G. Lentz (agl@bitbike.com)
+   Completed earlier partial translation; worked on consistency and spelling.
+   Version: 02-08-2001
+*/
 
 "hashchk",
 "isamchk",
 "NEE",
 "JA",
-"Kan file '%-.64s' niet aanmaken. (Errcode: %d)",
-"Kan tabel '%-.64s' niet aanmaken. (Errcode: %d)",
-"Kan database '%-.64s' niet aanmaken. Error %d",
-"Kan database '%-.64s' niet aanmaken. Database bestaat al",
+"Kan file '%-.64s' niet aanmaken (Errcode: %d)",
+"Kan tabel '%-.64s' niet aanmaken (Errcode: %d)",
+"Kan database '%-.64s' niet aanmaken (Errcode: %d)",
+"Kan database '%-.64s' niet aanmaken. Database bestaat reeds",
 "Kan database '%-.64s' niet verwijderen. Database bestaat niet",
-"Error verwijderen database (kan '%-.64s' niet verwijderen, error %d)",
-"Error verwijderen database (kan rmdir '%-.64s' niet uitvoeren, error %d)",
+"Error verwijderen database (kan '%-.64s' niet verwijderen, Errcode: %d)",
+"Error verwijderen database (kan rmdir '%-.64s' niet uitvoeren, Errcode: %d)",
 "Error bij het verwijderen van '%-.64s' (Errcode: %d)",
 "Kan record niet lezen in de systeem tabel",
 "Kan de status niet krijgen van '%-.64s' (Errcode: %d)",
@@ -23,27 +29,27 @@
 "Kan de directory niet veranderen naar '%-.64s' (Errcode: %d)",
 "Record is veranderd sinds de laatste lees activiteit in de tabel '%-.64s'",
 "Schijf vol (%s). Aan het wachten totdat er ruimte vrij wordt gemaakt...",
-"Kan niet schrijven, dubbele key in tabel '%-.64s'",
+"Kan niet schrijven, dubbele zoeksleutel in tabel '%-.64s'",
 "Fout bij het sluiten van '%-.64s' (Errcode: %d)",
 "Fout bij het lezen van file '%-.64s' (Errcode: %d)",
 "Fout bij het hernoemen van '%-.64s' naar '%-.64s' (Errcode: %d)",
 "Fout bij het wegschrijven van file '%-.64s' (Errcode: %d)",
 "'%-.64s' is geblokeerd tegen veranderingen",
 "Sorteren afgebroken",
-"View '%-.64s' bestaat niet voorr '%-.64s'",
+"View '%-.64s' bestaat niet voor '%-.64s'",
 "Fout %d van tabel handler",
 "Tabel handler voor '%-.64s' heeft deze optie niet",
 "Kan record niet vinden in '%-.64s'",
 "Verkeerde info in file: '%-.64s'",
-"Verkeerde key file voor tabel: '%-.64s'. Probeer het te repareren",
-"Oude key 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",
 "Onverwachte eof gevonden tijdens het lezen van file '%-.64s' (Errcode: %d)",
 "Te veel verbindingen",
-"Geen thread geheugen meer",
-"Kan de hostname niet krijgen van jou adres",
+"Geen thread geheugen meer; controleer of mysqld of andere processen al het beschikbare geheugen gebruikt. Zo niet, dan moet u wellicht 'ulimit' gebruiken om mysqld toe te laten meer geheugen te benutten, of u kunt extra swap ruimte toevoegen",
+"Kan de hostname niet krijgen van uw adres",
 "Verkeerde handshake",
 "Toegang geweigerd voor gebruiker: '%-.32s@%-.64s' naar database '%-.64s'",
 "Toegang geweigerd voor gebruiker: '%-.32s@%-.64s' (Wachtwoord gebruikt: %s)",
@@ -53,30 +59,30 @@
 "Onbekende database '%-.64s'",
 "Tabel '%-.64s' bestaat al",
 "Onbekende tabel '%-.64s'",
-"Kolom: '%-.64s' in %s is ambiguous",
+"Kolom: '%-.64s' in %s is niet eenduidig",
 "Bezig met het stoppen van de server",
 "Onbekende kolom '%-.64s' in %s",
-"Opdracht gebruikt '%-.64s' dat niet in de group by voorkomt",
+"Opdracht gebruikt '%-.64s' dat niet in de GROUP BY voorkomt",
 "Kan '%-.64s' niet groeperen",
 "Opdracht heeft totaliseer functies en kolommen in dezelfde opdracht",
 "Het aantal kolommen komt niet overeen met het aantal opgegeven waardes",
 "Naam voor herkenning '%-.64s' is te lang",
 "Dubbele kolom naam '%-.64s'",
-"Dubbele sleutel naam '%-.64s'",
-"Dubbele ingang '%-.64s' voor sleutel %d",
+"Dubbele zoeksleutel naam '%-.64s'",
+"Dubbele ingang '%-.64s' voor zoeksleutel %d",
 "Verkeerde kolom specificatie voor kolom '%-.64s'",
 "%s bij '%-.64s' in regel %d",
 "Query was leeg",
 "Niet unieke waarde tabel/alias: '%-.64s'",
 "Foutieve standaard waarde voor '%-.64s'",
-"Meerdere primaire sleutels gedefinieerd",
-"Teveel sleutels gedifinieerd. Maximaal zijn %d sleutels toegestaan",
-"Teveel sleutel onderdelen gespecificeerd. Maximaal %d onderdelen toegestaan",
-"Gespecificeerde sleutel was te lang. De maximale lengte is %d",
-"Sleutel kolom '%-.64s' bestaat niet in tabel",
-"Blob kolom '%-.64s' kan niet gebruikt worden bij key specificatie",
+"Meerdere primaire zoeksleutels gedefinieerd",
+"Teveel zoeksleutels gedefinieerd. Maximaal zijn %d zoeksleutels toegestaan",
+"Teveel zoeksleutel onderdelen gespecificeerd. Maximaal %d onderdelen toegestaan",
+"Gespecificeerde zoeksleutel was te lang. De maximale lengte is %d",
+"Zoeksleutel kolom '%-.64s' bestaat niet in tabel",
+"BLOB kolom '%-.64s' kan niet gebruikt worden bij zoeksleutel specificatie",
 "Te grote kolomlengte voor '%-.64s' (max = %d). Maak hiervoor gebruik van het type BLOB",
-"Er kan slechts 1 autofield zijn en deze moet als sleutel worden gedefinieerd.",
+"Er kan slechts 1 autofield zijn en deze moet als zoeksleutel worden gedefinieerd.",
 "%s: klaar voor verbindingen\n",
 "%s: Normaal afgesloten \n",
 "%s: Signaal %d. Systeem breekt af!\n",
@@ -84,15 +90,15 @@
 "%s: Afsluiten afgedwongen van thread %ld  gebruiker: '%-.64s'\n",
 "Kan IP-socket niet openen",
 "Tabel '%-.64s' heeft geen INDEX zoals deze gemaakt worden met CREATE INDEX. Maak de tabel opnieuw",
-"De argumenten om velden te scheiden zijn anders dan verwacht. Controleer de handleiding",
+"De argumenten om velden te scheiden zijn anders dan verwacht. Raadpleeg de handleiding",
 "Bij het gebruik van BLOBs is het niet mogelijk om vaste rijlengte te gebruiken. Maak s.v.p. gebruik van 'fields terminated by'.",
 "Het bestand '%-.64s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn.",
 "Het bestand '%-.64s' bestaat reeds",
 "Records: %ld  Verwijderd: %ld  Overgeslagen: %ld  Waarschuwingen: %ld",
 "Records: %ld  Dubbel: %ld",
-"Foutief sub-gedeelte van de sleutel. De gebruikte sleutel is geen onderdeel van een string of of de gebruikte lengte is langer dan de sleutel",
+"Foutief sub-gedeelte van de zoeksleutel. De gebruikte zoeksleutel is geen onderdeel van een string of of de gebruikte lengte is langer dan de zoeksleutel",
 "Het is niet mogelijk alle velden te verwijderen met ALTER TABLE. Gebruik a.u.b. DROP TABLE hiervoor!",
-"Kan '%-.64s' niet weggooien. Controleer of het veld of de sleutel daadwerkelijk bestaat.",
+"Kan '%-.64s' niet weggooien. Controleer of het veld of de zoeksleutel daadwerkelijk bestaat.",
 "Records: %ld  Dubbel: %ld  Waarschuwing: %ld",
 "INSERT TABLE '%-.64s' is niet toegestaan in de FROM tabel-lijst",
 "Onbekend thread id: %lu",
@@ -101,7 +107,7 @@
 "Teveel strings voor kolom %s en SET",
 "Het is niet mogelijk een unieke naam te maken voor de logfile %s.(1-999)\n",
 "Tabel '%-.64s' was gelocked met een lock om te lezen. Derhalve kunnen geen wijzigingen worden opgeslagen.",
-"Table '%-.64s' was niet gelocked met LOCK TABLES",
+"Tabel '%-.64s' was niet gelocked met LOCK TABLES",
 "Blob veld '%-.64s' can geen standaardwaarde bevatten",
 "Databasenaam '%-.64s' is niet getoegestaan",
 "Niet toegestane tabelnaam '%-.64s'",
@@ -120,101 +126,99 @@
 "Teveel tabellen. MySQL kan slechts %d tabellen in een join bevatten",
 "Te veel velden",
 "Rij-grootte is groter dan toegestaan. Maximale rij grootte, blobs niet meegeteld, is %d. U dient sommige velden in blobs te veranderen.",
-"Thread stapel overrun:  Gebruikte: %ld van een %ld stack.  Gebruik 'mysqld -O thread_stack=#' om een grotere stapel te definieren (indien noodzakelijk).",
-"Gekruiste afhankelijkheid gevonden in OUTER JOIN.  Controleer uw ON-conditions",
-"Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL",
-"Can't load function '%-.64s'",
-"Can't initialize function '%-.64s'; %-.80s",
-"No paths allowed for shared library",
-"Function '%-.64s' already exist",
-"Can't open shared library '%-.64s' (errno: %d %s)",
-"Can't find function '%-.64s' in library'",
-"Function '%-.64s' is not defined",
-"Host '%-.64s' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'",
-"Host '%-.64s' is not allowed to connect to this MySQL server",
-"You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
-"You must have privileges to update tables in the mysql database to be able to change passwords for others",
-"Can't find any matching row in the user table",
-"Rows matched: %ld  Changed: %ld  Warnings: %ld",
-"Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
-"Column count doesn't match value count at row %ld",
-"Can't reopen table: '%-.64s',
-"Invalid use of NULL value",
-"Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
-"There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s@%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s@%-.64s' for column '%-.64s' in table '%-.64s'",
-"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
-"The host or user argument to GRANT is too long",
-"Table '%-64s.%s' doesn't exist",
-"There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
-"The used command is not allowed with this MySQL version",
-"Something is wrong in your syntax",
-"Delayed insert thread couldn't get requested lock for table %-.64s",
-"Too many delayed threads in use",
-"Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)",
-"Got a packet bigger than 'max_allowed_packet'",
-"Got a read error from the connection pipe",
-"Got an error from fcntl()",
-"Got packets out of order",
-"Couldn't uncompress communication packet",
-"Got an error reading communication packets"
-"Got timeout reading communication packets",
-"Got an error writing communication packets",
-"Got timeout writing communication packets",
-"Result string is longer than max_allowed_packet",
-"The used table type doesn't support BLOB/TEXT columns",
-"The used table type doesn't support AUTO_INCREMENT columns",
-"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES",
-"Incorrect column name '%-.100s'",
-"The used table handler can't index column '%-.64s'",
-"All tables in the MERGE table are not defined identically",
-"Can't write, because of unique constraint, to table '%-.64s'",
-"BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
-"Result consisted of more than one row",
-"This table type requires a primary key",
-"This version of MySQL is not compiled with RAID support",
-"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
-"Key '%-.64s' doesn't exist in table '%-.64s'",
-"Can't open table",
-"The handler for the table doesn't support check/repair",
-"You are not allowed to execute this command in a transaction",
-"Got error %d during COMMIT",
-"Got error %d during ROLLBACK",
-"Got error %d during FLUSH_LOGS",
-"Got error %d during CHECKPOINT",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
-"The handler for the table does not support binary table dump",
-"Binlog closed while trying to FLUSH MASTER",
-"Failed rebuilding the index of dumped table '%-.64s'",
-"Error from master: '%-.64s'",
-"Net error reading from master",
-"Net error writing to master",
-"Can't find FULLTEXT index matching the column list",
-"Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64'",
-"Table '%-.64s' is marked as crashed and should be repaired",
-"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
-"This operation cannot be performed with a running slave, run SLAVE STOP first",
-"This operation requires a running slave, configure slave and do SLAVE START",
-"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
-"Could not initialize master info structure, check permisions on master.info",
-"Could not create slave thread, check system resources",
-"User %-.64s has already more than 'max_user_connections' active connections",
-"You may only use constant expressions with SET",
-"Lock wait timeout exceeded",
-"The total number of locks exceeds the lock table size",
-"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"DROP DATABASE not allowed while thread is holding global read lock",
-"CREATE DATABASE not allowed while thread is holding global read lock",
-"Wrong arguments to %s",
+"Thread stapel overrun:  Gebruikte: %ld van een %ld stack. Gebruik 'mysqld -O thread_stack=#' om een grotere stapel te definieren (indien noodzakelijk).",
+"Gekruiste afhankelijkheid gevonden in OUTER JOIN. Controleer uw ON-conditions",
+"Kolom '%-.64s' wordt gebruikt met UNIQUE of INDEX maar is niet gedefinieerd als NOT NULL",
+"Kan functie '%-.64s' niet laden",
+"Kan functie '%-.64s' niet initialiseren; %-.80s",
+"Geen pad toegestaan voor shared library",
+"Functie '%-.64s' bestaat reeds",
+"Kan shared library '%-.64s' niet openen (Errcode: %d %s)",
+"Kan functie '%-.64s' niet in library vinden",
+"Functie '%-.64s' is niet gedefinieerd",
+"Host '%-.64s' is geblokkeeerd vanwege te veel verbindings fouten. Deblokkeer met 'mysqladmin flush-hosts'",
+"Het is host '%-.64s' is niet toegestaan verbinding te maken met deze MySQL server",
+"U gebruikt MySQL als anonieme gebruiker en deze mogen geen wachtwoorden wijzigen",
+"U moet tabel update priveleges hebben in de mysql database om wachtwoorden voor anderen te mogen wijzigen",
+"Kan geen enkele passende rij vinden in de gebruikers tabel",
+"Passende rijen: %ld  Gewijzigd: %ld  Waarschuwingen: %ld",
+"Kan geen nieuwe thread aanmaken (Errcode: %d). Indien er geen tekort aan geheugen is kunt u de handleiding consulteren over een mogelijke OS afhankelijke fout",
+"Kolom aantal komt niet overeen met waarde aantal in rij %ld",
+"Kan tabel niet opnieuw openen: '%-.64s',
+"Foutief gebruik van de NULL waarde",
+"Fout '%-.64s' ontvangen van regexp",
+"Het mixen van GROUP kolommen (MIN(),MAX(),COUNT()...) met no-GROUP kolommen is foutief indien er geen GROUP BY clausule is",
+"Deze toegang (GRANT) is niet toegekend voor gebruiker '%-.32s' op host '%-.64s'",
+"%-.16s commando geweigerd voor gebruiker: '%-.32s@%-.64s' voor tabel '%-.64s'",
+"%-.16s commando geweigerd voor gebruiker: '%-.32s@%-.64s' voor kolom '%-.64s' in tabel '%-.64s'",
+"Foutief GRANT/REVOKE commando. Raadpleeg de handleiding welke priveleges gebruikt kunnen worden.",
+"De host of gebruiker parameter voor GRANT is te lang",
+"Tabel '%-64s.%s' bestaat niet",
+"Deze toegang (GRANT) is niet toegekend voor gebruiker '%-.32s' op host '%-.64s' op tabel '%-.64s'",
+"Het used commando is niet toegestaan in deze MySQL versie",
+"Er is iets fout in de gebruikte syntax",
+"'Delayed insert' thread kon de aangevraagde 'lock' niet krijgen voor tabel %-.64s",
+"Te veel 'delayed' threads in gebruik",
+"Afgebroken verbinding %ld naar db: '%-.64s' gebruiker: '%-.64s' (%s)",
+"Groter pakket ontvangen dan 'max_allowed_packet'",
+"Kreeg leesfout van de verbindings pipe",
+"Kreeg fout van fcntl()",
+"Pakketten in verkeerde volgorde ontvangen",
+"Communicatiepakket kon niet worden gedecomprimeerd",
+"Fout bij het lezen van communicatiepakketten"
+"Timeout bij het lezen van communicatiepakketten",
+"Resultaat string is langer dan max_allowed_packet",
+"Het gebruikte tabel type ondersteunt geen BLOB/TEXT kolommen",
+"Het gebruikte tabel type ondersteunt geen AUTO_INCREMENT kolommen",
+"INSERT DELAYED kan niet worden gebruikt bij table '%-.64s', vanwege een 'lock met LOCK TABLES",
+"Incorrecte kolom naam '%-.100s'",
+"De gebruikte tabel 'handler' kan kolom '%-.64s' niet indexeren",
+"Niet alle tabellen in de MERGE tabel hebben identieke gedefinities",
+"Kan niet opslaan naar table '%-.64s' vanwege 'unique' beperking",
+"BLOB kolom '%-.64s' gebruikt in zoeksleutel specificatie zonder zoeksleutel lengte",
+"Alle delen van een PRIMARY KEY moeten NOT NULL zijn; Indien u NULL in een zoeksleutel nodig heeft kunt u UNIQUE gebruiken",
+"Resultaat bevatte meer dan een rij",
+"Dit tabel type heeft een primaire zoeksleutel nodig",
+"Deze versie van MySQL is niet gecompileerd met RAID ondersteuning",
+"U gebruikt 'safe update mode' en u probeerde een tabel te updaten zonder een WHERE met een KEY kolom",
+"Zoeksleutel '%-.64s' bestaat niet in tabel '%-.64s'",
+"Kan tabel niet openen",
+"De 'handler' voor de tabel ondersteund geen check/repair",
+"Het is u niet toegestaan dit commando uit te voeren binnen een transactie",
+"Kreeg fout %d tijdens COMMIT",
+"Kreeg fout %d tijdens ROLLBACK",
+"Kreeg fout %d tijdens FLUSH_LOGS",
+"Kreeg fout %d tijdens CHECKPOINT",
+"Afgebroken verbinding %ld naar db: '%-.64s' gebruiker: '%-.32s' host: `%-.64s' (%-.64s)",
+"De 'handler' voor de tabel ondersteund geen binaire tabel dump",
+"Binlog gesloten tijdens FLUSH MASTER poging",
+"Gefaald tijdens heropbouw index van gedumpte tabel '%-.64s'",
+"Fout van master: '%-.64s'",
+"Net fout tijdens lezen van master",
+"Net fout tijdens schrijven naar master",
+"Kan geen FULLTEXT index vinden passend bij de kolom lijst",
+"Kan het gegeven commando niet uitvoeren, want u heeft actieve gelockte tabellen of een actieve transactie",
+"Onbekende systeem variabele '%-.64'",
+"Tabel '%-.64s' staat als gecrashed gemarkeerd en dient te worden gerepareerd",
+"Tabel '%-.64s' staat als gecrashed gemarkeerd en de laatste (automatische?) reparatie poging mislukte",
+"Waarschuwing: Roll back mislukt voor sommige buiten transacties gewijzigde tabellen",
+"Multi-statement transactie vereist meer dan 'max_binlog_cache_size' bytes opslag. Verhoog deze mysqld variabele en probeer opnieuw',
+"Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst SLAVE STOP",
+"Deze operatie vereist een actieve slave, configureer slave en doe dan SLAVE START",
+"De server is niet geconfigureerd als slave, fix in configuratie bestand of met CHANGE MASTER TO",
+"Kon master info structuur niet initialiseren, controleer permissies in master.info",
+"Kon slave thread niet aanmaken, controleer systeem resources",
+"Gebruiker %-.64s heeft reeds meer dan 'max_user_connections' actieve verbindingen",
+"U mag alleen constante expressies gebruiken bij SET",
+"Lock wacht tijd overschreden",
+"Het totale aantal locks overschrijdt de lock tabel grootte",
+"Update locks kunnen niet worden verkregen tijdens een READ UNCOMMITTED transactie",
+"DROP DATABASE niet toegestaan terwijl thread een globale 'read lock' bezit",
+"CREATE DATABASE niet toegestaan terwijl thread een globale 'read lock' bezit",
+"Foutieve parameters voor %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/english/errmsg.txt

@@ -153,7 +153,7 @@
 "You have an error in your SQL syntax",
 "Delayed insert thread couldn't get requested lock for table %-.64s",
 "Too many delayed threads in use",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s) - see http://www.mysql.com/doc/C/o/Communication_errors.html",
+"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)",
 "Got a packet bigger than 'max_allowed_packet'",
 "Got a read error from the connection pipe",
 "Got an error from fcntl()",
@@ -185,7 +185,7 @@
 "Got error %d during ROLLBACK",
 "Got error %d during FLUSH_LOGS",
 "Got error %d during CHECKPOINT",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s) - see http://www.mysql.com/doc/C/o/Communication_errors.html",
+"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
 "The handler for the table does not support binary table dump",
 "Binlog closed, cannot RESET MASTER",
 "Failed rebuilding the index of  dumped table '%-.64s'",
@@ -212,9 +212,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/estonian/errmsg.txt

@@ -216,9 +216,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/french/errmsg.txt

@@ -212,9 +212,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/german/errmsg.txt

@@ -215,9 +215,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/greek/errmsg.txt

@@ -212,9 +212,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/hungarian/errmsg.txt

@@ -214,9 +214,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/italian/errmsg.txt

@@ -212,9 +212,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/japanese/errmsg.txt

@@ -214,9 +214,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/korean/errmsg.txt

@@ -212,9 +212,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/norwegian-ny/errmsg.txt

@@ -214,9 +214,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/norwegian/errmsg.txt

@@ -214,9 +214,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/polish/errmsg.txt

@@ -216,9 +216,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/portuguese/errmsg.txt

@@ -206,15 +206,15 @@
 "Não conseguiu criar 'thread' de 'slave'. Verifique os recursos do sistema",
 "Usuário '%-.64s' já possui 'max_user_connections' conexões ativas",
 "Você pode usar apenas expressões de constante com SET",
-"Lock wait timeout exceeded",
-"The total number of locks exceeds the lock table size",
-"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"DROP DATABASE not allowed while thread is holding global read lock",
-"CREATE DATABASE not allowed while thread is holding global read lock",
+"Excedido tempo de espera (timeout) do travamento",
+"O número total de travamentos excede o tamanho de travamento da tabela",
+"Travamentos de atualização não podem ser obtidos durante um READ UNCOMMITTED na transação",
+"DROP DATABASE não permitido enquanto uma 'thread' está assegurando um travamento global de leitura",
+"CREATE DATABASE não permitido enquanto uma 'thread' está assegurando um travamento global de leitura",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/romanian/errmsg.txt

@@ -216,9 +216,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/russian/errmsg.txt

@@ -215,9 +215,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/slovak/errmsg.txt

@@ -220,9 +220,9 @@
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
 "Error when executing command %s: %-.128s",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/spanish/errmsg.txt

@@ -213,9 +213,9 @@
 "DROP DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global",
 "CREATE DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global",
 "Wrong arguments to %s",
+"%-.32s@%-.64s is not allowed to create new users",
 "Error de coneccion a master: %-128s",
 "Error executando el query en master: %-128%",
 "Error de %s: %-128%",
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
-"%-.32s@%-.64s is not allowed to create new users",

sql/share/swedish/errmsg.txt

@@ -212,9 +212,9 @@
 "DROP DATABASE är inte tillåtet när man har ett globalt läs-lås",
 "CREATE DATABASE är inte tillåtet när man har ett globalt läs-lås",
 "Felaktiga argument till %s",
+"%-.32s@%-.64s har inte rättigheter att skapa nya användare",
 "Fick fel vid anslutning till master: %-.128s",
 "Fick fel vid utförande av command på mastern: %-.128s",
 "Fick fel vid utförande av %s: %-.128s",
 "Felaktig använding av %s and %s",
 "SELECT kommandona har olika antal kolumner"
-"%-.32s@%-.64s is not allowed to create new users",