Commit 719b1c5d authored by unknown's avatar unknown

corrected error message for OPTIMIZE/ANALYZE/etc,

also for InnoDB that supports CHECK table but not REPAIR
parent e8ed5408
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
"Update tabulky bez WHERE s kl-Bem nen v mdu bezpench update dovoleno", "Update tabulky bez WHERE s kl-Bem nen v mdu bezpench update dovoleno",
"Kl-B '%-.64s' v tabulce '%-.64s' neexistuje", "Kl-B '%-.64s' v tabulce '%-.64s' neexistuje",
"Nemohu otev-Bt tabulku", "Nemohu otev-Bt tabulku",
"Handler tabulky nepodporuje check/repair", "Handler tabulky nepodporuje %s",
"Proveden-B tohoto pkazu nen v transakci dovoleno", "Proveden-B tohoto pkazu nen v transakci dovoleno",
"Chyba %d p-Bi COMMIT", "Chyba %d p-Bi COMMIT",
"Chyba %d p-Bi ROLLBACK", "Chyba %d p-Bi ROLLBACK",
......
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
"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", "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'", "Nøglen '%-.64s' eksisterer ikke i tabellen '%-.64s'",
"Kan ikke åbne tabellen", "Kan ikke åbne tabellen",
"Denne tabeltype understøtter ikke CHECK/REPAIR", "Denne tabeltype understøtter ikke %s",
"Du må ikke bruge denne kommando i en transaktion", "Du må ikke bruge denne kommando i en transaktion",
"Modtog fejl %d mens kommandoen COMMIT blev udført", "Modtog fejl %d mens kommandoen COMMIT blev udført",
"Modtog fejl %d mens kommandoen ROLLBACK blev udført", "Modtog fejl %d mens kommandoen ROLLBACK blev udført",
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
"U gebruikt 'safe update mode' en u probeerde een tabel te updaten zonder een WHERE met een KEY kolom", "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'", "Zoeksleutel '%-.64s' bestaat niet in tabel '%-.64s'",
"Kan tabel niet openen", "Kan tabel niet openen",
"De 'handler' voor de tabel ondersteund geen check/repair", "De 'handler' voor de tabel ondersteund geen %s",
"Het is u niet toegestaan dit commando uit te voeren binnen een transactie", "Het is u niet toegestaan dit commando uit te voeren binnen een transactie",
"Kreeg fout %d tijdens COMMIT", "Kreeg fout %d tijdens COMMIT",
"Kreeg fout %d tijdens ROLLBACK", "Kreeg fout %d tijdens ROLLBACK",
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
"Katse muuta tabelit turvalises rezhiimis ilma WHERE klauslita", "Katse muuta tabelit turvalises rezhiimis ilma WHERE klauslita",
"Vti '%-.64s' ei eksisteeri tabelis '%-.64s'", "Vti '%-.64s' ei eksisteeri tabelis '%-.64s'",
"Ei suuda avada tabelit", "Ei suuda avada tabelit",
"Antud tabelitp ei toeta CHECK/REPAIR kske", "Antud tabelitp ei toeta %s kske",
"Seda ksku ei saa kasutada transaktsiooni sees", "Seda ksku ei saa kasutada transaktsiooni sees",
"Viga %d ksu COMMIT titmisel", "Viga %d ksu COMMIT titmisel",
"Viga %d ksu ROLLBACK titmisel", "Viga %d ksu ROLLBACK titmisel",
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"Vous êtes en mode 'safe update' et vous essayez de faire un UPDATE sans clause WHERE utilisant un index", "Vous êtes en mode 'safe update' et vous essayez de faire un UPDATE sans clause WHERE utilisant un index",
"L'index '%-.64s' n'existe pas sur la table '%-.64s'", "L'index '%-.64s' n'existe pas sur la table '%-.64s'",
"Impossible d'ouvrir la table", "Impossible d'ouvrir la table",
"Ce type de table ne supporte pas les check/repair", "Ce type de table ne supporte pas les %s",
"Vous n'êtes pas autorisé à exécute cette commande dans une transaction", "Vous n'êtes pas autorisé à exécute cette commande dans une transaction",
"Erreur %d lors du COMMIT", "Erreur %d lors du COMMIT",
"Erreur %d lors du ROLLBACK", "Erreur %d lors du ROLLBACK",
......
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
"Unter Verwendung des Sicheren Updatemodes wurde versucht eine Tabelle zu updaten ohne eine KEY-Spalte in der WHERE-Klausel", "Unter Verwendung des Sicheren Updatemodes wurde versucht eine Tabelle zu updaten ohne eine KEY-Spalte in der WHERE-Klausel",
"Schlüssel '%-.64s' existiert nicht in der Tabelle '%-.64s'", "Schlüssel '%-.64s' existiert nicht in der Tabelle '%-.64s'",
"Kann Tabelle nicht öffnen", "Kann Tabelle nicht öffnen",
"Der Tabellen-Handler für diese Tabelle unterstützt kein check/repair", "Der Tabellen-Handler für diese Tabelle unterstützt kein %s",
"Keine Berechtigung dieses Kommando in einer Transaktion auszuführen", "Keine Berechtigung dieses Kommando in einer Transaktion auszuführen",
"Fehler %d wärend COMMIT", "Fehler %d wärend COMMIT",
"Fehler %d wärend ROLLBACK", "Fehler %d wärend ROLLBACK",
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
"On a biztonsagos update modot hasznalja, es WHERE that uses a KEY column", "On a biztonsagos update modot hasznalja, es WHERE that uses a KEY column",
"A '%-.64s' kulcs nem letezik a '%-.64s' tablaban", "A '%-.64s' kulcs nem letezik a '%-.64s' tablaban",
"Nem tudom megnyitni a tablat", "Nem tudom megnyitni a tablat",
"A tabla kezeloje (handler) nem tamogatja az ellenorzest/helyreallitast", "A tabla kezeloje (handler) nem tamogatja az %s",
"Az On szamara nem engedelyezett a parancs vegrehajtasa a tranzakcioban", "Az On szamara nem engedelyezett a parancs vegrehajtasa a tranzakcioban",
"%d hiba a COMMIT vegrehajtasa soran", "%d hiba a COMMIT vegrehajtasa soran",
"%d hiba a ROLLBACK vegrehajtasa soran", "%d hiba a ROLLBACK vegrehajtasa soran",
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"In modalita` 'safe update' si e` cercato di aggiornare una tabella senza clausola WHERE su una chiave", "In modalita` 'safe update' si e` cercato di aggiornare una tabella senza clausola WHERE su una chiave",
"La chiave '%-.64s' non esiste nella tabella '%-.64s'", "La chiave '%-.64s' non esiste nella tabella '%-.64s'",
"Impossibile aprire la tabella", "Impossibile aprire la tabella",
"Il gestore per la tabella non supporta il controllo/riparazione", "Il gestore per la tabella non supporta il %s",
"Non puoi eseguire questo comando in una transazione", "Non puoi eseguire questo comando in una transazione",
"Rilevato l'errore %d durante il COMMIT", "Rilevato l'errore %d durante il COMMIT",
"Rilevato l'errore %d durante il ROLLBACK", "Rilevato l'errore %d durante il ROLLBACK",
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"Você está usando modo de atualização seguro e tentou atualizar uma tabela sem uma cláusula WHERE que use uma coluna chave", "Você está usando modo de atualização seguro e tentou atualizar uma tabela sem uma cláusula WHERE que use uma coluna chave",
"Chave '%-.64s' não existe na tabela '%-.64s'", "Chave '%-.64s' não existe na tabela '%-.64s'",
"Não pode abrir a tabela", "Não pode abrir a tabela",
"O manipulador de tabela não suporta checagem/reparação (check/repair)", "O manipulador de tabela não suporta %s",
"Não lhe é permitido executar este comando em uma transação", "Não lhe é permitido executar este comando em uma transação",
"Obteve erro %d durante COMMIT", "Obteve erro %d durante COMMIT",
"Obteve erro %d durante ROLLBACK", "Obteve erro %d durante ROLLBACK",
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
"MySQL (safe_mode) - UPDATE WHERE - KEY", "MySQL (safe_mode) - UPDATE WHERE - KEY",
" '%-.64s' '%-.64s'", " '%-.64s' '%-.64s'",
" ", " ",
" check/repair", " %s",
" ", " ",
" %d COMMIT", " %d COMMIT",
" %d ROLLBACK", " %d ROLLBACK",
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "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'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The handler for the table doesn't support check/repair", "The handler for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
"Tu estás usando modo de actualización segura y tentado actualizar una tabla sin un WHERE que usa una KEY columna", "Tu estás usando modo de actualización segura y tentado actualizar una tabla sin un WHERE que usa una KEY columna",
"Clave '%-.64s' no existe en la tabla '%-.64s'", "Clave '%-.64s' no existe en la tabla '%-.64s'",
"No puedo abrir tabla", "No puedo abrir tabla",
"El manipulador de la tabla no permite soporte para check/repair", "El manipulador de la tabla no permite soporte para %s",
"No tienes el permiso para ejecutar este comando en una transición", "No tienes el permiso para ejecutar este comando en una transición",
"Obtenido error %d durante COMMIT", "Obtenido error %d durante COMMIT",
"Obtenido error %d durante ROLLBACK", "Obtenido error %d durante ROLLBACK",
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"Du använder 'säker uppdaterings mod' och försökte uppdatera en table utan en WHERE sats som använder sig av en nyckel", "Du använder 'säker uppdaterings mod' och försökte uppdatera en table utan en WHERE sats som använder sig av en nyckel",
"Nyckel '%-.64s' finns inte in tabell '%-.64s'", "Nyckel '%-.64s' finns inte in tabell '%-.64s'",
"Kan inte öppna tabellen", "Kan inte öppna tabellen",
"Tabellhanteraren för denna tabell kan inte göra check/repair", "Tabellhanteraren för denna tabell kan inte göra %s",
"Du får inte utföra detta kommando i en transaktion", "Du får inte utföra detta kommando i en transaktion",
"Fick fel %d vid COMMIT", "Fick fel %d vid COMMIT",
"Fick fel %d vid ROLLBACK", "Fick fel %d vid ROLLBACK",
......
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
" ͦ WHERE, դ KEY ", " ͦ WHERE, դ KEY ",
" '%-.64s' դ æ '%-.64s'", " '%-.64s' դ æ '%-.64s'",
" צ ", " צ ",
"ڦ æ Ц צ/צ", "ڦ æ Ц %s",
" æ", " æ",
" %d Ц COMMIT", " %d Ц COMMIT",
" %d Ц ROLLBACK", " %d Ц ROLLBACK",
......
...@@ -1167,8 +1167,13 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -1167,8 +1167,13 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
switch (result_code) { switch (result_code) {
case HA_ADMIN_NOT_IMPLEMENTED: case HA_ADMIN_NOT_IMPLEMENTED:
{
char buf[ERRMSGSIZE+20];
my_snprintf(buf, ERRMSGSIZE,
ER(ER_CHECK_NOT_IMPLEMENTED), operator_name);
net_store_data(packet, "error"); net_store_data(packet, "error");
net_store_data(packet, ER(ER_CHECK_NOT_IMPLEMENTED)); net_store_data(packet, buf);
}
break; break;
case HA_ADMIN_OK: case HA_ADMIN_OK:
......
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