Merge mysql.com:/home/my/mysql-5.0

into mysql.com:/home/my/mysql-5.1 VC++Files/libmysqld/libmysqld.dsp: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/heap_btree.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/r/ndb_blob.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/mysql_client_test.test: Auto merged mysql-test/t/mysqltest.test: Auto merged sql/ha_myisam.cc: Auto merged sql/item_func.h: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged storage/heap/hp_delete.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/myisamlog.c: Auto merged storage/ndb/include/kernel/signaldata/TcKeyReq.hpp: Auto merged storage/ndb/include/ndbapi/NdbBlob.hpp: Auto merged storage/ndb/test/ndbapi/testBlobs.cpp: Auto merged storage/ndb/tools/delete_all.cpp: Auto merged VC++Files/libmysqld/libmysqld.vcproj: Use original file (my_user.c was already added in 5.1) mysql-test/mysql-test-run.pl: Manual merge sql/handler.h: Manual merge sql/share/errmsg.txt: Align error messages with 5.0 sql/sql_table.cc: Manual merge storage/ndb/src/ndbapi/NdbBlob.cpp: No changes
2026-05-07 07:35:32 +02:00 · 2006-05-04 15:58:30 +03:00 · 2006-05-04 15:58:30 +03:00 · 1f89605e4b
commit 1f89605e4b
parent 79d87430db 63791773b1
29 changed files with 251 additions and 120 deletions
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@ -2978,52 +2978,52 @@ ER_UDF_EXISTS
 	swe "Funktionen '%-.64s' finns redan"
 	ukr "æÕÎËÃ¦Ñ '%-.64s' ×ÖÅ ¦ÓÎÕ¤"
 ER_CANT_OPEN_LIBRARY  
-	cze "Nemohu otev-Bøít sdílenou knihovnu '%-.64s' (errno: %d %s)"
-	dan "Kan ikke åbne delt bibliotek '%-.64s' (errno: %d %s)"
-	nla "Kan shared library '%-.64s' niet openen (Errcode: %d %s)"
-	eng "Can't open shared library '%-.64s' (errno: %d %s)"
-	jps "shared library '%-.64s' ‚ðŠJ‚Ž–‚ª‚Å‚«‚Ü‚¹‚ñ (errno: %d %s)",
-	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %s)"
-	fre "Impossible d'ouvrir la bibliothèque partagée '%-.64s' (errno: %d %s)"
-	ger "Kann Shared Library '%-.64s' nicht öffnen (Fehler: %d %s)"
-	greek "Äåí åßíáé äõíáôÞ ç áíÜãíùóç ôçò shared library '%-.64s' (êùäéêüò ëÜèïõò: %d %s)"
-	hun "A(z) '%-.64s' megosztott konyvtar nem hasznalhato (hibakod: %d %s)"
-	ita "Impossibile aprire la libreria condivisa '%-.64s' (errno: %d %s)"
-	jpn "shared library '%-.64s' ¤ò³«¤¯»ö¤¬¤Ç¤¤Þ¤»¤ó (errno: %d %s)"
-	kor "'%-.64s' °øÀ¯ ¶óÀÌ¹ö·¯¸®¸¦ ¿¼ö ¾ø½À´Ï´Ù.(¿¡·¯¹øÈ£: %d %s)"
-	nor "Can't open shared library '%-.64s' (errno: %d %s)"
-	norwegian-ny "Can't open shared library '%-.64s' (errno: %d %s)"
-	pol "Can't open shared library '%-.64s' (errno: %d %s)"
-	por "Não pode abrir biblioteca compartilhada '%-.64s' (erro no. '%d' - '%-.64s')"
-	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %s)"
-	rus "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÉÎÁÍÉÞÅÓËÕÀ ÂÉÂÌÉÏÔÅËÕ '%-.64s' (ÏÛÉÂËÁ: %d %s)"
-	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %s)"
-	slo "Nemô¾em otvori» zdieµanú kni¾nicu '%-.64s' (chybový kód: %d %s)"
-	spa "No puedo abrir libraria conjugada '%-.64s' (errno: %d %s)"
-	swe "Kan inte öppna det dynamiska biblioteket '%-.64s' (Felkod: %d %s)"
-	ukr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÒÏÚÄ¦ÌÀ×ÁÎÕ Â¦ÂÌ¦ÏÔÅËÕ '%-.64s' (ÐÏÍÉÌËÁ: %d %s)"
-ER_CANT_FIND_DL_ENTRY  
-	cze "Nemohu naj-Bít funkci '%-.64s' v knihovnì"
-	dan "Kan ikke finde funktionen '%-.64s' i bibliotek"
-	nla "Kan functie '%-.64s' niet in library vinden"
-	eng "Can't find symbol '%-.64s' in library"
-	jps "function '%-.64s' ‚ðƒ‰ƒCƒuƒ‰ƒŠ<C692>[’†‚ÉŒ©•t‚¯‚éŽ–‚ª‚Å‚«‚Ü‚¹‚ñ",
-	est "Ei leia funktsiooni '%-.64s' antud teegis"
-	fre "Impossible de trouver la fonction '%-.64s' dans la bibliothèque"
-	ger "Kann Funktion '%-.64s' in der Library nicht finden"
-	greek "Äåí åßíáé äõíáôÞ ç áíåýñåóç ôçò óõíÜñôçóçò '%-.64s' óôçí âéâëéïèÞêç"
-	hun "A(z) '%-.64s' fuggveny nem talalhato a konyvtarban"
-	ita "Impossibile trovare la funzione '%-.64s' nella libreria"
-	jpn "function '%-.64s' ¤ò¥é¥¤¥Ö¥é¥ê¡¼Ãæ¤Ë¸«ÉÕ¤±¤ë»ö¤¬¤Ç¤¤Þ¤»¤ó"
-	kor "¶óÀÌ¹ö·¯¸®¿¡¼ '%-.64s' ÇÔ¼ö¸¦ Ã£À» ¼ö ¾ø½À´Ï´Ù."
-	por "Não pode encontrar a função '%-.64s' na biblioteca"
-	rum "Nu pot gasi functia '%-.64s' in libraria"
-	rus "îÅ×ÏÚÍÏÖÎÏ ÏÔÙÓËÁÔØ ÓÉÍ×ÏÌ '%-.64s' × ÂÉÂÌÉÏÔÅËÅ"
-	serbian "Ne mogu da pronadjem funkciju '%-.64s' u biblioteci"
-	slo "Nemô¾em nájs» funkciu '%-.64s' v kni¾nici"
-	spa "No puedo encontrar función '%-.64s' en libraria"
-	swe "Hittar inte funktionen '%-.64s' in det dynamiska biblioteket"
-	ukr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÆÕÎËÃ¦À '%-.64s' Õ Â¦ÂÌ¦ÏÔÅÃ¦"
+	cze "Nemohu otev-Bøít sdílenou knihovnu '%-.64s' (errno: %d %-.128s)"
+	dan "Kan ikke åbne delt bibliotek '%-.64s' (errno: %d %-.128s)"
+	nla "Kan shared library '%-.64s' niet openen (Errcode: %d %-.128s)"
+	eng "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	jps "shared library '%-.64s' ‚ðŠJ‚Ž–‚ª‚Å‚«‚Ü‚¹‚ñ (errno: %d %-.128s)",
+	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.128s)"
+	fre "Impossible d'ouvrir la bibliothèque partagée '%-.64s' (errno: %d %-.128s)"
+	ger "Kann Shared Library '%-.64s' nicht öffnen (Fehler: %d %-.128s)"
+	greek "Äåí åßíáé äõíáôÞ ç áíÜãíùóç ôçò shared library '%-.64s' (êùäéêüò ëÜèïõò: %d %-.128s)"
+	hun "A(z) '%-.64s' megosztott konyvtar nem hasznalhato (hibakod: %d %-.128s)"
+	ita "Impossibile aprire la libreria condivisa '%-.64s' (errno: %d %-.128s)"
+	jpn "shared library '%-.64s' ¤ò³«¤¯»ö¤¬¤Ç¤¤Þ¤»¤ó (errno: %d %-.128s)"
+	kor "'%-.64s' °øÀ¯ ¶óÀÌ¹ö·¯¸®¸¦ ¿¼ö ¾ø½À´Ï´Ù.(¿¡·¯¹øÈ£: %d %-.128s)"
+	nor "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	norwegian-ny "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	pol "Can't open shared library '%-.64s' (errno: %d %-.128s)"
+	por "Não pode abrir biblioteca compartilhada '%-.64s' (erro no. %d '%-.128s')"
+	rum "Nu pot deschide libraria shared '%-.64s' (Eroare: %d %-.128s)"
+	rus "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÉÎÁÍÉÞÅÓËÕÀ ÂÉÂÌÉÏÔÅËÕ '%-.64s' (ÏÛÉÂËÁ: %d %-.128s)"
+	serbian "Ne mogu da otvorim share-ovanu biblioteku '%-.64s' (errno: %d %-.128s)"
+	slo "Nemô¾em otvori» zdieµanú kni¾nicu '%-.64s' (chybový kód: %d %-.128s)"
+	spa "No puedo abrir libraria conjugada '%-.64s' (errno: %d %-.128s)"
+	swe "Kan inte öppna det dynamiska biblioteket '%-.64s' (Felkod: %d %-.128s)"
+	ukr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÒÏÚÄ¦ÌÀ×ÁÎÕ Â¦ÂÌ¦ÏÔÅËÕ '%-.64s' (ÐÏÍÉÌËÁ: %d %-.128s)"
+ER_CANT_FIND_DL_ENTRY
+	cze "Nemohu naj-Bít funkci '%-.128s' v knihovnì"
+	dan "Kan ikke finde funktionen '%-.128s' i bibliotek"
+	nla "Kan functie '%-.128s' niet in library vinden"
+	eng "Can't find symbol '%-.128s' in library"
+	jps "function '%-.128s' ‚ðƒ‰ƒCƒuƒ‰ƒŠ<C692>[’†‚ÉŒ©•t‚¯‚éŽ–‚ª‚Å‚«‚Ü‚¹‚ñ",
+	est "Ei leia funktsiooni '%-.128s' antud teegis"
+	fre "Impossible de trouver la fonction '%-.128s' dans la bibliothèque"
+	ger "Kann Funktion '%-.128s' in der Library nicht finden"
+	greek "Äåí åßíáé äõíáôÞ ç áíåýñåóç ôçò óõíÜñôçóçò '%-.128s' óôçí âéâëéïèÞêç"
+	hun "A(z) '%-.128s' fuggveny nem talalhato a konyvtarban"
+	ita "Impossibile trovare la funzione '%-.128s' nella libreria"
+	jpn "function '%-.128s' ¤ò¥é¥¤¥Ö¥é¥ê¡¼Ãæ¤Ë¸«ÉÕ¤±¤ë»ö¤¬¤Ç¤¤Þ¤»¤ó"
+	kor "¶óÀÌ¹ö·¯¸®¿¡¼ '%-.128s' ÇÔ¼ö¸¦ Ã£À» ¼ö ¾ø½À´Ï´Ù."
+	por "Não pode encontrar a função '%-.128s' na biblioteca"
+	rum "Nu pot gasi functia '%-.128s' in libraria"
+	rus "îÅ×ÏÚÍÏÖÎÏ ÏÔÙÓËÁÔØ ÓÉÍ×ÏÌ '%-.128s' × ÂÉÂÌÉÏÔÅËÅ"
+	serbian "Ne mogu da pronadjem funkciju '%-.128s' u biblioteci"
+	slo "Nemô¾em nájs» funkciu '%-.128s' v kni¾nici"
+	spa "No puedo encontrar función '%-.128s' en libraria"
+	swe "Hittar inte funktionen '%-.128s' in det dynamiska biblioteket"
+	ukr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÆÕÎËÃ¦À '%-.128s' Õ Â¦ÂÌ¦ÏÔÅÃ¦"
 ER_FUNCTION_NOT_DEFINED  
 	cze "Funkce '%-.64s' nen-Bí definována"
 	dan "Funktionen '%-.64s' er ikke defineret"
@ -4898,7 +4898,10 @@ ER_WARN_NULL_TO_NOTNULL 22004
 	por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld"
 	spa "Datos truncado, NULL suministrado para NOT NULL columna '%s' en la línea %ld"
 ER_WARN_DATA_OUT_OF_RANGE 22003 
-	eng "Out of range value for column '%s' at row %ld"
+	eng "Out of range value adjusted for column '%s' at row %ld"
+	ger "Daten abgeschnitten, außerhalb des Wertebereichs für Feld '%s' in Zeile %ld"
+	por "Dado truncado, fora de alcance para coluna '%s' na linha %ld"
+	spa "Datos truncados, fuera de gama para columna '%s' en la línea %ld"
 WARN_DATA_TRUNCATED 01000 
 	eng "Data truncated for column '%s' at row %ld"
 	ger "Daten abgeschnitten für Feld '%s' in Zeile %ld"
@ -5602,6 +5605,25 @@ ER_SP_RECURSION_LIMIT
        ger "Rekursionsgrenze %d (durch Variable max_sp_recursion_depth gegeben) wurde für Routine %.64s überschritten"
 ER_SP_PROC_TABLE_CORRUPT
 	eng "Failed to load routine %-.64s. The table mysql.proc is missing, corrupt, or contains bad data (internal code %d)"
+ER_SP_WRONG_NAME 42000
+	eng "Incorrect routine name '%-.64s'"
+ER_TABLE_NEEDS_UPGRADE
+         eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
+ER_SP_NO_AGGREGATE 42000
+	eng "AGGREGATE is not supported for stored functions"
+ER_MAX_PREPARED_STMT_COUNT_REACHED 42000
+        eng "Can't create more than max_prepared_stmt_count statements (current value: %lu)"
+ER_VIEW_RECURSIVE
+        eng "`%-.64s`.`%-.64s` contains view recursion"
+ER_NON_GROUPING_FIELD_USED 42000
+	eng "non-grouping field '%-.64s' is used in %-.64s clause"
+ER_TABLE_CANT_HANDLE_SPKEYS
+        eng "The used table type doesn't support SPATIAL indexes"
+ER_WARN_DEPRECATED_SYNTAX  
+        eng  "The syntax '%s' is deprecated and will be removed in MySQL %s. Please use %s instead."
+	ger "'%s' ist veraltet. Bitte benutzen Sie '%s'"
+	por "'%s' é desatualizado. Use '%s' em seu lugar"
+	spa "'%s' está desaprobado, use '%s' en su lugar"
 ER_PARTITION_REQUIRES_VALUES_ERROR
        eng "%-.64s PARTITIONING requires definition of VALUES %-.64s for each partition"
        swe "%-.64s PARTITIONering kräver definition av VALUES %-.64s för varje partition"
@ -5802,28 +5824,10 @@ ER_CANT_WRITE_LOCK_LOG_TABLE
        eng "You can't write-lock a log table. Only read access is possible."
 ER_CANT_READ_LOCK_LOG_TABLE
        eng "You can't use usual read lock with log tables. Try READ LOCAL instead."
-ER_SP_WRONG_NAME 42000
-	eng "Incorrect routine name '%-.64s'"
 ER_FOREIGN_DUPLICATE_KEY 23000 S1009
 	eng "Upholding foreign key constraints for table '%.64s', entry '%-.64s', key %d would lead to a duplicate entry"
 ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
        eng "Column count of mysql.%s is wrong. Expected %d, found %d. Created with MySQL %d, now running %d. Please use scripts/mysql_fix_privilege_tables"
-ER_TABLE_NEEDS_UPGRADE
-         eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
-ER_ILLEGAL_HA_CREATE_OPTION
-        eng "Table storage engine '%-.64s' does not support the create option '%.64s'"
-ER_CANT_CHANGE_TX_ISOLATION 25001
-	eng "Transaction isolation level can't be changed while a transaction is in progress"
-ER_WARN_DEPRECATED
-        eng  "The syntax '%s' is deprecated and will be removed in MySQL %s. Please use %s instead."
-ER_SP_NO_AGGREGATE 42000
-	eng "AGGREGATE is not supported for stored functions"
-ER_MAX_PREPARED_STMT_COUNT_REACHED 42000
-        eng "Can't create more than max_prepared_stmt_count statements (current value: %lu)"
-ER_VIEW_RECURSIVE
-        eng "`%-.64s`.`%-.64s` contains view recursion"
-ER_NON_GROUPING_FIELD_USED 42000
-	eng "non-grouping field '%-.64s' is used in %-.64s clause"
 ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR
 	eng "Cannot switch out of the row-based binary log format when the session has open temporary tables"
 ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT
@ -5840,3 +5844,7 @@ ER_NULL_IN_VALUES_LESS_THAN
 ER_WRONG_PARTITION_NAME
        eng "Incorrect partition name"
        swe "Felaktigt partitionsnamn"
+ER_ILLEGAL_HA_CREATE_OPTION
+        eng "Table storage engine '%-.64s' does not support the create option '%.64s'"
+ER_CANT_CHANGE_TX_ISOLATION 25001
+	eng "Transaction isolation level can't be changed while a transaction is in progress"