Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb

sql/share/czech/errmsg.txt

@@ -208,8 +208,8 @@ v/*
 "Tabulka '%-.64s' je ozna-Bena jako poruen a posledn (automatick?) oprava se nezdaila",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/danish/errmsg.txt

@@ -202,8 +202,8 @@
 "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 handling kunne ikke udføres med kørende slave, brug først kommandoen STOP SLAVE",
+"Denne handling kræver en kørende slave. Konfigurer en slave og brug kommandoen START SLAVE",
 "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",

sql/share/dutch/errmsg.txt

@@ -210,8 +210,8 @@
 "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",
+"Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst STOP SLAVE",
+"Deze operatie vereist een actieve slave, configureer slave en doe dan START SLAVE",
 "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",

sql/share/english/errmsg.txt

@@ -199,8 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/estonian/errmsg.txt

@@ -204,8 +204,8 @@
 "Tabel '%-.64s' on mrgitud vigaseks ja viimane (automaatne?) parandus ebannestus",
 "Hoiatus: mnesid transaktsioone mittetoetavaid tabeleid ei suudetud tagasi kerida",
 "Mitme lausendiga transaktsioon nudis rohkem ruumi kui lubatud 'max_binlog_cache_size' muutujaga. Suurenda muutuja vrtust ja proovi uuesti",
-"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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/french/errmsg.txt

@@ -199,8 +199,8 @@
 "La table '%-.64s' est marquée 'crashed' et le dernier 'repair' a échoué",
 "Attention: certaines tables ne supportant pas les transactions ont été changées et elles ne pourront pas être restituées",
 "Cette transaction à commandes multiples nécessite plus de 'max_binlog_cache_size' octets de stockage, augmentez cette variable de mysqld et réessayez',
-"Cette opération ne peut être réalisée avec un esclave actif, faites SLAVE STOP d'abord",
-"Cette opération nécessite un esclave actif, configurez les esclaves et faites SLAVE START",
+"Cette opération ne peut être réalisée avec un esclave actif, faites STOP SLAVE d'abord",
+"Cette opération nécessite un esclave actif, configurez les esclaves et faites START SLAVE",
 "Le server n'est pas configuré comme un esclave, changez le fichier de configuration ou utilisez CHANGE MASTER TO",
 "Impossible d'initialiser les structures d'information de maître, vérifiez les permissions sur master.info",
 "Impossible de créer une tâche esclave, vérifiez les ressources système",

sql/share/german/errmsg.txt

@@ -208,8 +208,8 @@
 "Tabelle '%-.64s' ist als defekt makiert und der letzte (automatische) Reparaturversuch schlug fehl.",
 "Warnung:  Das Rollback konnte bei einigen Tabellen, die nicht mittels Transaktionen geändert wurden, nicht ausgeführt werden.",
 "Multi-Statement Transaktionen benötigen mehr als 'max_binlog_cache_size' Bytes An Speicher. Diese mysqld-Variable vergrössern und erneut versuchen.',
-"Diese Operation kann nicht bei einem aktiven Slave durchgeführt werden. Das Kommand SLAVE STOP muss zuerst ausgeführt werden.",
-"Diese Operation benötigt einen aktiven Slave. Slave konfigurieren und mittels SLAVE START aktivieren.",
+"Diese Operation kann nicht bei einem aktiven Slave durchgeführt werden. Das Kommand STOP SLAVE muss zuerst ausgeführt werden.",
+"Diese Operation benötigt einen aktiven Slave. Slave konfigurieren und mittels START SLAVE aktivieren.",
 "Der Server ist nicht als Slave konfigiriert. Im Konfigurations-File oder mittel CHANGE MASTER TO beheben.",
 "Konnte Master-Info-Struktur nicht initialisieren; Berechtigungen von master.info prüfen.",
 "Konnte keinen Slave-Thread starten. System-Resourcen überprüfen.",

sql/share/greek/errmsg.txt

@@ -199,8 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/hungarian/errmsg.txt

@@ -201,8 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/italian/errmsg.txt

@@ -199,8 +199,8 @@
 "La tabella '%-.64s' e` segnalata come corrotta e l'ultima ricostruzione (automatica?) e` fallita",
 "Attenzione: Alcune delle modifiche alle tabelle non transazionali non possono essere ripristinate (roll back impossibile)",
 "La transazione a comandi multipli (multi-statement) ha richiesto piu` di 'max_binlog_cache_size' bytes di disco: aumentare questa variabile di mysqld e riprovare',
-"Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima SLAVE STOP",
-"Questa operaione richiede un database 'slave', configurarlo ed eseguire SLAVE START",
+"Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima STOP SLAVE",
+"Questa operaione richiede un database 'slave', configurarlo ed eseguire START SLAVE",
 "Il server non e' configurato come 'slave', correggere il file di configurazione cambiando CHANGE MASTER TO",
 "Impossibile inizializzare la struttura 'master info', controllare i permessi sul file master.info",
 "Impossibile creare il thread 'slave', controllare le risorse di sistema",

sql/share/japanese/errmsg.txt

@@ -201,8 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/korean/errmsg.txt

@@ -199,8 +199,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/norwegian-ny/errmsg.txt

@@ -201,8 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/norwegian/errmsg.txt

@@ -201,8 +201,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/polish/errmsg.txt

@@ -203,8 +203,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/portuguese/errmsg.txt

@@ -199,8 +199,8 @@
 "Tabela '%-.64s' está marcada como danificada e a última reparação (automática?) falhou",
 "Aviso: Algumas tabelas não-transacionais alteradas não puderam ser reconstituídas (rolled back)",
 "Transações multi-declaradas (multi-statement transactions) requeriram mais do que o valor limite (max_binlog_cache_size) de bytes para armazenagem. Aumente o valor desta variável do mysqld e tente novamente",
-"Esta operação não pode ser realizada com um 'slave' em execução. Execute SLAVE STOP primeiro",
-"Esta operação requer um 'slave' em execução. Configure  o 'slave' e execute SLAVE START",
+"Esta operação não pode ser realizada com um 'slave' em execução. Execute STOP SLAVE primeiro",
+"Esta operação requer um 'slave' em execução. Configure  o 'slave' e execute START SLAVE",
 "O servidor não está configurado como 'slave'. Acerte o arquivo de configuração ou use CHANGE MASTER TO",
 "Não pode inicializar a estrutura de informação do 'master'. Verifique as permissões em 'master.info'",
 "Não conseguiu criar 'thread' de 'slave'. Verifique os recursos do sistema",

sql/share/romanian/errmsg.txt

@@ -203,8 +203,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/russian/errmsg.txt

@@ -202,8 +202,8 @@
 " '%-.64s'        (?)  ",
 ":      ROLLBACK",
 "    'max_binlog_cache_size' -       ",
-"      slave,  SLAVE STOP",
-"     slave,  SLAVE START",
+"      slave,  STOP SLAVE",
+"     slave,  START SLAVE",
 "   slave,       CHANGE MASTER TO",
 "    master info,  persmissions   master.info",
 "    SLAVE,   ",

sql/share/serbian/errmsg.txt

@@ -205,8 +205,8 @@
 "Tabela '%-.64s' je markirana kao oteena, a zadnja (automatska?) popravka je bila neuspela",
 "Upozorenje: Neke izmenjene tabele ne podravaju komandu 'ROLLBACK'",
 "Transakcija sa vie stavki zahtevala je vie od 'max_binlog_cache_size' bajtova skladinog prostora. Uveajte ovu promenljivu servera i pokuajte ponovo',
-"Ova operacija ne moe biti izvrena dok je aktivan podreeni server. Zadajte prvo komandu 'SLAVE STOP' da zaustavite podreeni server.",
-"Ova operacija zahteva da je aktivan podreeni server. Konfiguriite prvo podreeni server i onda izvrite komandu 'SLAVE START'",
+"Ova operacija ne moe biti izvrena dok je aktivan podreeni server. Zadajte prvo komandu 'STOP SLAVE' da zaustavite podreeni server.",
+"Ova operacija zahteva da je aktivan podreeni server. Konfiguriite prvo podreeni server i onda izvrite komandu 'START SLAVE'",
 "Server nije konfigurisan kao podreeni server, ispravite konfiguracioni file ili na njemu izvrite komandu 'CHANGE MASTER TO'",
 "Nisam mogao da inicijalizujem informacionu strukturu glavnog servera, proverite da li imam privilegije potrebne za pristup file-u 'master.info'",
 "Nisam mogao da startujem thread za podreeni server, proverite sistemske resurse",

sql/share/slovak/errmsg.txt

@@ -207,8 +207,8 @@
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
 "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",
+"This operation cannot be performed with a running slave, run STOP SLAVE first",
+"This operation requires a running slave, configure slave and do START SLAVE",
 "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",

sql/share/spanish/errmsg.txt

@@ -200,8 +200,8 @@
 "Tabla '%-.64s' está marcada como crashed y la última reparación (automactica?) falló",
 "Aviso:  Algunas tablas no transancionales no pueden tener rolled back",
 "Multipla transición necesita mas que 'max_binlog_cache_size' bytes de almacenamiento. Aumente esta variable mysqld y tente de nuevo',
-"Esta operación no puede ser hecha con el esclavo funcionando, primero use SLAVE STOP",
-"Esta operación necesita el esclavo funcionando, configure esclavo y haga el SLAVE START",
+"Esta operación no puede ser hecha con el esclavo funcionando, primero use STOP SLAVE",
+"Esta operación necesita el esclavo funcionando, configure esclavo y haga el START SLAVE",
 "El servidor no está configurado como esclavo, edite el archivo config file o con CHANGE MASTER TO",
 "No puedo inicializar la estructura info del master, verifique permisiones en el master.info",
 "No puedo crear el thread esclavo, verifique recursos del sistema",

sql/share/swedish/errmsg.txt

@@ -199,8 +199,8 @@
 "Tabell '%-.64s' är crashad och senast (automatiska?) reparation misslyckades",
 "Några icke transaktionella tabeller kunde inte återställas vid ROLLBACK",
 "Transaktionen krävde mera än 'max_binlog_cache_size' minne. Utöka denna mysqld variabel och försök på nytt",
-"Denna operation kan inte göras under replikering; Gör SLAVE STOP först",
-"Denna operation kan endast göras under replikering; Konfigurera slaven och gör SLAVE START",
+"Denna operation kan inte göras under replikering; Gör STOP SLAVE först",
+"Denna operation kan endast göras under replikering; Konfigurera slaven och gör START SLAVE",
 "Servern är inte konfigurerade som en replikations slav. Ändra konfigurationsfilen eller gör CHANGE MASTER TO",
 "Kunde inte initializera replications-strukturerna. Kontrollera privilegerna för 'master.info'",
 "Kunde inte starta en tråd för replikering",

sql/share/ukrainian/errmsg.txt

@@ -204,8 +204,8 @@
 " '%-.64s'   ڦ  Τ (?) צ  ",
 ": ˦ æΦ ͦ     ",
 "æ     ¦ Φ 'max_binlog_cache_size' Ԧ  Ҧ. ¦  ͦ mysqld   ',
-"æ       Ц,   SLAVE STOP",
-"æ   Ц, Ʀ Ц   SLAVE START",
+"æ       Ц,   STOP SLAVE",
+"æ   Ц, Ʀ Ц   START SLAVE",
 "  Ʀ  Ц,    ̦ Ʀæ   CHANGE MASTER TO",
 "  Φæ̦  æ , צ    master.info",
 "   Ц Ǧ, צ Φ ",