database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2008-04-02 10:58:37 -04:00
parent 393c1a01d0 babd981e41
commit cb29e2396b
7 changed files with 435 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
sql/share/errmsg.txt
View File

@ -1771,30 +1771,30 @@ ER_BLOB_USED_AS_KEY 42000 S1009
swe "En BLOB '%-.64s' kan inte vara nyckel med den anv<6E>nda tabelltypen"
ukr "BLOB <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Φ <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>Ц <20><><EFBFBD><EFBFBD><EFBFBD>æ"
ER_TOO_BIG_FIELDLENGTH 42000 S1009
cze "P-B<><42>li<6C> velk<6C> d<>lka sloupce '%-.64s' (nejv<6A>ce %d). Pou<6F>ijte BLOB"
dan "For stor feltl<74>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' <20><>,<2C>m<EFBFBD>ۂ<EFBFBD><DB82><EFBFBD> column <20>̑傫<CC91><E582AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>. (<28>ő<EFBFBD> %d <20>܂<EFBFBD>). BLOB <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ɏg<C98E>p<EFBFBD><70><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",
est "Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %d). Kasuta BLOB v<>ljat<61><74>pi"
fre "Champ '%-.64s' trop long (max = %d). Utilisez un BLOB"
ger "Feldl<64>nge f<>r Feld '%-.64s' zu gro<72> (maximal %d). BLOB- oder TEXT-Spaltentyp verwenden!"
greek "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (max = %d). <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> 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' <20><>,<2C><><EFBFBD>ݤ<EFBFBD><DDA4><EFBFBD> column <20><><EFBFBD>礭<EFBFBD><E7A4AD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>. (<28><><EFBFBD><EFBFBD> %d <20>ޤ<EFBFBD>). BLOB <20>򤫤<EFBFBD><F2A4ABA4><EFBFBD><EFBFBD>˻<EFBFBD><CBBB>Ѥ<EFBFBD><D1A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
kor "Į<><C4AE> '%-.64s'<27><> Į<><C4AE> <20><><EFBFBD>̰<EFBFBD> <20>ʹ<EFBFBD> <20><><EFBFBD>ϴ<EFBFBD> (<28>ִ<EFBFBD> = %d). <20><><EFBFBD>ſ<EFBFBD> BLOB<4F><42> <20><><EFBFBD><EFBFBD><EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>."
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<64>a d<>ugo?<3F> 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 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = %d). <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> BLOB <20><><EFBFBD> TEXT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
serbian "Previ<76>e podataka za kolonu '%-.64s' (maksimum je %d). Upotrebite BLOB polje"
slo "Pr<50>li<6C> ve<76>k<EFBFBD> d<><64>ka pre pole '%-.64s' (maximum = %d). Pou<6F>ite BLOB"
spa "Longitud de columna demasiado grande para la columna '%-.64s' (maximo = %d).Usar BLOB en su lugar"
swe "F<>r stor kolumnl<6E>ngd angiven f<>r '%-.64s' (max= %d). Anv<6E>nd en BLOB inst<73>llet"
ukr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (max = %d). <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> BLOB"
cze "P-B<><42>li<6C> velk<6C> d<>lka sloupce '%-.64s' (nejv<6A>ce %lu). Pou<6F>ijte BLOB"
dan "For stor feltl<74>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' <20><>,<2C>m<EFBFBD>ۂ<EFBFBD><DB82><EFBFBD> column <20>̑傫<CC91><E582AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>. (<28>ő<EFBFBD> %lu <20>܂<EFBFBD>). BLOB <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ɏg<C98E>p<EFBFBD><70><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",
est "Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %lu). Kasuta BLOB v<>ljat<61><74>pi"
fre "Champ '%-.64s' trop long (max = %lu). Utilisez un BLOB"
ger "Feldl<64>nge f<>r Feld '%-.64s' zu gro<72> (maximal %lu). BLOB- oder TEXT-Spaltentyp verwenden!"
greek "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (max = %lu). <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> 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' <20><>,<2C><><EFBFBD>ݤ<EFBFBD><DDA4><EFBFBD> column <20><><EFBFBD>礭<EFBFBD><E7A4AD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>. (<28><><EFBFBD><EFBFBD> %lu <20>ޤ<EFBFBD>). BLOB <20>򤫤<EFBFBD><F2A4ABA4><EFBFBD><EFBFBD>˻<EFBFBD><CBBB>Ѥ<EFBFBD><D1A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
kor "Į<><C4AE> '%-.64s'<27><> Į<><C4AE> <20><><EFBFBD>̰<EFBFBD> <20>ʹ<EFBFBD> <20><><EFBFBD>ϴ<EFBFBD> (<28>ִ<EFBFBD> = %lu). <20><><EFBFBD>ſ<EFBFBD> BLOB<4F><42> <20><><EFBFBD><EFBFBD><EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>."
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<64>a d<>ugo?<3F> 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 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = %lu). <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> BLOB <20><><EFBFBD> TEXT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
serbian "Previ<76>e podataka za kolonu '%-.64s' (maksimum je %lu). Upotrebite BLOB polje"
slo "Pr<50>li<6C> ve<76>k<EFBFBD> d<><64>ka pre pole '%-.64s' (maximum = %lu). Pou<6F>ite BLOB"
spa "Longitud de columna demasiado grande para la columna '%-.64s' (maximo = %lu).Usar BLOB en su lugar"
swe "F<>r stor kolumnl<6E>ngd angiven f<>r '%-.64s' (max= %lu). Anv<6E>nd en BLOB inst<73>llet"
ukr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' (max = %lu). <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> BLOB"
ER_WRONG_AUTO_KEY 42000 S1009
cze "M-B<><42>ete m<>t pouze jedno AUTO pole a to mus<75> b<>t definov<6F>no jako kl<6B><6C>"
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<72>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<72>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<72>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<72>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<65><6D>ige Schl<68>ssel-Cache kann nicht gel<65>scht werden"
ER_TOO_BIG_DISPLAYWIDTH 42000 S1009
eng "Display width out of range for column '%-.64s' (max = %d)"
ger "Anzeigebreite au<61>erhalb des zul<75>ssigen Bereichs f<>r Spalte '%-.64s' (Maximum: %d)"
eng "Display width out of range for column '%-.64s' (max = %lu)"
ger "Anzeigebreite au<61>erhalb des zul<75>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"