Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 30 insertions, 30 deletions

diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index a3514776d6e..0ee623ecaf5 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -1771,30 +1771,30 @@ ER_BLOB_USED_AS_KEY 42000 S1009
 	swe "En BLOB '%-.64s' kan inte vara nyckel med den anv�nda tabelltypen"
 	ukr "BLOB �������� '%-.64s' �� ���� ���� ������������ � ��������Φ ����� � ����� ��Ц �����æ"
 ER_TOO_BIG_FIELDLENGTH 42000 S1009
-	cze "P-B��li� velk� d�lka sloupce '%-.64s' (nejv�ce %d). Pou�ijte BLOB"
-	dan "For stor feltl�ngde for kolonne '%-.64s' (maks = %d). Brug BLOB i stedet"
-	nla "Te grote kolomlengte voor '%-.64s' (max = %d). Maak hiervoor gebruik van het type BLOB"
-	eng "Column length too big for column '%-.64s' (max = %d); use BLOB or TEXT instead"
-	jps "column '%-.64s' ��,�m�ۂ��� column �̑傫�����������܂�. (�ő� %d �܂�). BLOB �������Ɏg�p���Ă�������.",
-	est "Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %d). Kasuta BLOB v�ljat��pi"
-	fre "Champ '%-.64s' trop long (max = %d). Utilisez un BLOB"
-	ger "Feldl�nge f�r Feld '%-.64s' zu gro� (maximal %d). BLOB- oder TEXT-Spaltentyp verwenden!"
-	greek "���� ������ ����� ��� �� ����� '%-.64s' (max = %d). �������� ��������������� ��� ���� BLOB"
-	hun "A(z) '%-.64s' oszlop tul hosszu. (maximum = %d). Hasznaljon BLOB tipust inkabb."
-	ita "La colonna '%-.64s' e` troppo grande (max=%d). Utilizza un BLOB."
-	jpn "column '%-.64s' ��,���ݤ��� column ���礭����¿�����ޤ�. (���� %d �ޤ�). BLOB �򤫤��˻��Ѥ��Ƥ�������."
-	kor "Į�� '%-.64s'�� Į�� ���̰� �ʹ� ��ϴ� (�ִ� = %d). ��ſ� BLOB�� ����ϼ���."
-	nor "For stor n�kkellengde for kolonne '%-.64s' (maks = %d). Bruk BLOB istedenfor"
-	norwegian-ny "For stor nykkellengde for felt '%-.64s' (maks = %d). Bruk BLOB istadenfor"
-	pol "Zbyt du�a d�ugo?� kolumny '%-.64s' (maks. = %d). W zamian u�yj typu BLOB"
-	por "Comprimento da coluna '%-.64s' grande demais (max = %d); use BLOB em seu lugar"
-	rum "Lungimea coloanei '%-.64s' este prea lunga (maximum = %d). Foloseste BLOB mai bine"
-	rus "������� ������� ����� ������� '%-.64s' (�������� = %d). ����������� ��� BLOB ��� TEXT ������ ��������"
-	serbian "Previ�e podataka za kolonu '%-.64s' (maksimum je %d). Upotrebite BLOB polje"
-	slo "Pr�li� ve�k� d�ka pre pole '%-.64s' (maximum = %d). Pou�ite BLOB"
-	spa "Longitud de columna demasiado grande para la columna '%-.64s' (maximo = %d).Usar BLOB en su lugar"
-	swe "F�r stor kolumnl�ngd angiven f�r '%-.64s' (max= %d). Anv�nd en BLOB inst�llet"
-	ukr "������� ������� ������� '%-.64s' (max = %d). ������������ ��� BLOB"
+	cze "P-B��li� velk� d�lka sloupce '%-.64s' (nejv�ce %lu). Pou�ijte BLOB"
+	dan "For stor feltl�ngde for kolonne '%-.64s' (maks = %lu). Brug BLOB i stedet"
+	nla "Te grote kolomlengte voor '%-.64s' (max = %lu). Maak hiervoor gebruik van het type BLOB"
+	eng "Column length too big for column '%-.64s' (max = %lu); use BLOB or TEXT instead"
+	jps "column '%-.64s' ��,�m�ۂ��� column �̑傫�����������܂�. (�ő� %lu �܂�). BLOB �������Ɏg�p���Ă�������.",
+	est "Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %lu). Kasuta BLOB v�ljat��pi"
+	fre "Champ '%-.64s' trop long (max = %lu). Utilisez un BLOB"
+	ger "Feldl�nge f�r Feld '%-.64s' zu gro� (maximal %lu). BLOB- oder TEXT-Spaltentyp verwenden!"
+	greek "���� ������ ����� ��� �� ����� '%-.64s' (max = %lu). �������� ��������������� ��� ���� BLOB"
+	hun "A(z) '%-.64s' oszlop tul hosszu. (maximum = %lu). Hasznaljon BLOB tipust inkabb."
+	ita "La colonna '%-.64s' e` troppo grande (max=%lu). Utilizza un BLOB."
+	jpn "column '%-.64s' ��,���ݤ��� column ���礭����¿�����ޤ�. (���� %lu �ޤ�). BLOB �򤫤��˻��Ѥ��Ƥ�������."
+	kor "Į�� '%-.64s'�� Į�� ���̰� �ʹ� ��ϴ� (�ִ� = %lu). ��ſ� BLOB�� ����ϼ���."
+	nor "For stor n�kkellengde for kolonne '%-.64s' (maks = %lu). Bruk BLOB istedenfor"
+	norwegian-ny "For stor nykkellengde for felt '%-.64s' (maks = %lu). Bruk BLOB istadenfor"
+	pol "Zbyt du�a d�ugo?� kolumny '%-.64s' (maks. = %lu). W zamian u�yj typu BLOB"
+	por "Comprimento da coluna '%-.64s' grande demais (max = %lu); use BLOB em seu lugar"
+	rum "Lungimea coloanei '%-.64s' este prea lunga (maximum = %lu). Foloseste BLOB mai bine"
+	rus "������� ������� ����� ������� '%-.64s' (�������� = %lu). ����������� ��� BLOB ��� TEXT ������ ��������"
+	serbian "Previ�e podataka za kolonu '%-.64s' (maksimum je %lu). Upotrebite BLOB polje"
+	slo "Pr�li� ve�k� d�ka pre pole '%-.64s' (maximum = %lu). Pou�ite BLOB"
+	spa "Longitud de columna demasiado grande para la columna '%-.64s' (maximo = %lu).Usar BLOB en su lugar"
+	swe "F�r stor kolumnl�ngd angiven f�r '%-.64s' (max= %lu). Anv�nd en BLOB inst�llet"
+	ukr "������� ������� ������� '%-.64s' (max = %lu). ������������ ��� BLOB"
 ER_WRONG_AUTO_KEY 42000 S1009
 	cze "M-B��ete m�t pouze jedno AUTO pole a to mus� b�t definov�no jako kl��"
 	dan "Der kan kun specificeres eet AUTO_INCREMENT-felt, og det skal v�re indekseret"
@@ -5508,11 +5508,11 @@ ER_SP_NO_RECURSION
         eng "Recursive stored functions and triggers are not allowed."
 	ger "Rekursive gespeicherte Routinen und Triggers sind nicht erlaubt"
 ER_TOO_BIG_SCALE 42000 S1009
-        eng "Too big scale %d specified for column '%-.64s'. Maximum is %d."
-	ger "Zu gro�er Skalierungsfaktor %d f�r Feld '%-.64s' angegeben. Maximum ist %d"
+        eng "Too big scale %lu specified for column '%-.64s'. Maximum is %d."
+	ger "Zu gro�er Skalierungsfaktor %lu f�r Feld '%-.64s' angegeben. Maximum ist %d"
 ER_TOO_BIG_PRECISION 42000 S1009
-        eng "Too big precision %d specified for column '%-.64s'. Maximum is %d."
-	ger "Zu gro�e Genauigkeit %d f�r Feld '%-.64s' angegeben. Maximum ist %d"
+        eng "Too big precision %lu specified for column '%-.64s'. Maximum is %lu."
+	ger "Zu gro�e Genauigkeit %lu f�r Feld '%-.64s' angegeben. Maximum ist %lu"
 ER_M_BIGGER_THAN_D 42000 S1009
         eng "For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '%-.64s')."
 	ger "F�r FLOAT(M,D), DOUBLE(M,D) oder DECIMAL(M,D) muss M >= D sein (Feld '%-.64s')"
@@ -5550,8 +5550,8 @@ ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
 	eng "Cannot drop default keycache"
         ger "Der vorgabem��ige Schl�ssel-Cache kann nicht gel�scht werden"
 ER_TOO_BIG_DISPLAYWIDTH 42000 S1009
-	eng "Display width out of range for column '%-.64s' (max = %d)"
-	ger "Anzeigebreite au�erhalb des zul�ssigen Bereichs f�r Spalte '%-.64s' (Maximum: %d)"
+	eng "Display width out of range for column '%-.64s' (max = %lu)"
+	ger "Anzeigebreite au�erhalb des zul�ssigen Bereichs f�r Spalte '%-.64s' (Maximum: %lu)"
 ER_XAER_DUPID XAE08
         eng "XAER_DUPID: The XID already exists"
 	ger "XAER_DUPID: Die XID existiert bereits"