MySQL Lists: internals: bk commit into 5.0 tree (andrey:1.1963)

List:	Internals	« Previous Message Next Message »
From:	ahristov	Date:	August 8 2005 4:56pm
Subject:	bk commit into 5.0 tree (andrey:1.1963)
View as plain text
Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1963 05/08/08 16:56:50 andrey@lmy004. +1 -0
  manual merge

  sql/share/errmsg.txt
    1.39 05/08/08 16:56:44 andrey@lmy004. +6 -6
    manual merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	lmy004.
# Root:	/home/andrey/mysql-5.0-bug12207/RESYNC

--- 1.38/sql/share/errmsg.txt	2005-08-07 20:39:11 +02:00
+++ 1.39/sql/share/errmsg.txt	2005-08-08 16:56:44 +02:00
@@ -3174,7 +3174,7 @@
 	dan "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"
 	nla "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"
 	eng "Can't create a new thread (errno %d); if you are not out of available memory, you
can consult the manual for a possible OS-dependent bug"
-	jps "�V�K�ɃX���b�h�ª���܂¹��łµ�½ (errno %d).
�µ�ő�g�p���������[�����z�¦�Ă¢�Ȃ¢�̂ɃG���[�ª��¶�µ�Ă¢��Ȃ�,
�}�j���A���̒��©�� 'possible OS-dependent bug'
�Ƃ¢�¤�¶����T�µ�Ă�݂Ă¾�³�¢.",
+	jps "�V�K�ɃX���b�h�ª���܂¹��łµ�½ (errno %d).
�µ�ő�g�p���������[�����z�¦��¢�Ȃ¢�̂ɃG���[�ª��¶�µ�Ă¢��Ȃ�,
�}�j���A���̒��©�� 'possible OS-dependent bug'
�Ƃ¢�¤�¶����T�µ�Ă�݂Ă¾�³�¢.",
 	est "Ei suuda luua uut l�ime (veakood %d). Kui m�lu ei ole otsas, on t�en�oliselt
tegemist operatsioonis�steemispetsiifilise veaga"
 	fre "Impossible de cr�er une nouvelle t�che (errno %d). S'il reste de la m�moire libre,
consultez le manual pour trouver un �ventuel bug d�pendant de l'OS"
 	ger "Kann keinen neuen Thread erzeugen (Fehler: %d). Sollte noch Speicher verf�gbar
sein, bitte im Handbuch wegen m�glicher Fehler im Betriebssystem nachschlagen"
@@ -3577,7 +3577,7 @@
 	ger "fcntl() lieferte einen Fehler"
 	hun "Hiba a fcntl() fuggvenyben"
 	ita "Rilevato un errore da fcntl()"
-	kor "fcntl() �Լκ��� ¿¡·¯°¡
¹߻��Ͽ´½��ϴ�."
+	kor "fcntl() �Լκ��� ¿¡·¯°¡
¹߻��Ͽ´½��ϴ�."
 	por "Obteve um erro em fcntl()"
 	rum "Eroare obtinuta de la fcntl()"
 	rus "�������� ������ �� fcntl()"
@@ -4183,7 +4183,7 @@
 	ger "Netzfehler beim Schreiben zum Master"
 	ita "Errore di rete durante l'invio al master"
 	por "Erro de rede gravando no 'master'"
-	rus "�������� ������ ������ � �������� ������������ � �������� ��������"
+	rus "�������� ������ ������ � �������� ������������ � Ï������ ��������"
 	serbian "Gre�ka u slanju mre�nih paketa na glavni server u klasteru"
 	spa "Error de red escribiendo para el master"
 	swe "Fick n�tverksfel vid skrivning till master"
@@ -4457,7 +4457,7 @@
 	serbian "Pogre�ni argumenti prosle�eni na %s"
 	spa "Argumentos errados para %s"
 	swe "Felaktiga argument till %s"
-	ukr "������ �������� ��� %s"
+	ukr "������ Ç����� ��� %s"
 ER_NO_PERMISSION_TO_CREATE_USER 42000 
 	nla "'%-.32s'@'%-.64s' mag geen nieuwe gebruikers creeren"
 	eng "'%-.32s'@'%-.64s' is not allowed to create new users"
@@ -5391,3 +5391,5 @@
 ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
 	eng "Cannot drop default keycache"
         ger "Der Default-Keycache kann nicht gel�scht werden"
+ER_UNSUPPORTED_ENGINE_OPERATION
+	end "Operation not supported by this table handler"
Thread
• bk commit into 5.0 tree (andrey:1.1963)	ahristov	8 Aug