Commit e3db4389 authored Nov 12, 2004 by unknown

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

parents 4e561d74 2c6a3b97

sql/share/french/errmsg.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ character-set=latin1
		"Erreur d'écriture réseau reçue du maître",
		"Impossible de trouver un index FULLTEXT correspondant à cette liste de colonnes",
		"Impossible d'exécuter la commande car vous avez des tables verrouillées ou une transaction active",
		"Variable système '%-.64' inconnue",
		"Variable système '%-.64s' inconnue",
		"La table '%-.64s' est marquée 'crashed' et devrait être réparée",
		"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",

sql/share/greek/errmsg.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ character-set=greek
		"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)",
		"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)",
		"Got a packet bigger than 'max_allowed_packet' bytes",
		"Got a read error from the connection pipe",
		"Got an error from fcntl()",

sql/share/portuguese/errmsg.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ character-set=latin1
		"Erro de rede gravando no 'master'",
		"Não pode encontrar um índice para o texto todo que combine com a lista de colunas",
		"Não pode executar o comando dado porque você tem tabelas ativas travadas ou uma transação ativa",
		"Variável de sistema '%-.64' desconhecida",
		"Variável de sistema '%-.64s' desconhecida",
		"Tabela '%-.64s' está marcada como danificada e deve ser reparada",
		"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)",

sql/share/romanian/errmsg.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ character-set=latin2
		"Aveti o eroare in sintaxa RSQL",
		"Thread-ul pentru inserarea aminata nu a putut obtine lacatul (lock) pentru tabela %-.64s",
		"Prea multe threaduri aminate care sint in uz",
		"Conectie terminata %ld la baza de date: '%-.64s' utilizator: '%-32s' (%-.64s)",
		"Conectie terminata %ld la baza de date: '%-.64s' utilizator: '%-.32s' (%-.64s)",
		"Un packet mai mare decit 'max_allowed_packet' a fost primit",
		"Eroare la citire din cauza lui 'connection pipe'",
		"Eroare obtinuta de la fcntl()",

sql/share/serbian/errmsg.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ character-set=cp1250
		"Greka u slanju mrenih paketa na glavni server u klasteru",
		"Ne mogu da pronaem 'FULLTEXT' indeks koli odgovara listi kolona",
		"Ne mogu da izvrim datu komandu zbog toga to su tabele zakljuane ili je transakcija u toku",
		"Nepoznata sistemska promenljiva '%-.64'",
		"Nepoznata sistemska promenljiva '%-.64s'",
		"Tabela '%-.64s' je markirana kao oteena i trebala bi biti popravljena",
		"Tabela '%-.64s' je markirana kao oteena, a zadnja (automatska?) popravka je bila neuspela",
		"Upozorenje: Neke izmenjene tabele ne podravaju komandu 'ROLLBACK'",