Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
77346b1d
Commit
77346b1d
authored
20 years ago
by
tim@sand.box
Browse files
Options
Browse Files
Download
Plain Diff
Merge sand.box:/home/tim/m/40/bk into sand.box:/home/tim/m/40/a
parents
af88ae0a
6ce0b07a
Changes
22
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
24 additions
and
21 deletions
+24
-21
sql/mysqld.cc
sql/mysqld.cc
+3
-0
sql/share/czech/errmsg.txt
sql/share/czech/errmsg.txt
+1
-1
sql/share/danish/errmsg.txt
sql/share/danish/errmsg.txt
+1
-1
sql/share/dutch/errmsg.txt
sql/share/dutch/errmsg.txt
+1
-1
sql/share/english/errmsg.txt
sql/share/english/errmsg.txt
+1
-1
sql/share/estonian/errmsg.txt
sql/share/estonian/errmsg.txt
+1
-1
sql/share/french/errmsg.txt
sql/share/french/errmsg.txt
+1
-1
sql/share/german/errmsg.txt
sql/share/german/errmsg.txt
+1
-1
sql/share/greek/errmsg.txt
sql/share/greek/errmsg.txt
+1
-1
sql/share/hungarian/errmsg.txt
sql/share/hungarian/errmsg.txt
+1
-1
sql/share/japanese/errmsg.txt
sql/share/japanese/errmsg.txt
+1
-1
sql/share/korean/errmsg.txt
sql/share/korean/errmsg.txt
+1
-1
sql/share/norwegian-ny/errmsg.txt
sql/share/norwegian-ny/errmsg.txt
+1
-1
sql/share/norwegian/errmsg.txt
sql/share/norwegian/errmsg.txt
+1
-1
sql/share/polish/errmsg.txt
sql/share/polish/errmsg.txt
+1
-1
sql/share/portuguese/errmsg.txt
sql/share/portuguese/errmsg.txt
+1
-1
sql/share/romanian/errmsg.txt
sql/share/romanian/errmsg.txt
+1
-1
sql/share/russian/errmsg.txt
sql/share/russian/errmsg.txt
+1
-1
sql/share/slovak/errmsg.txt
sql/share/slovak/errmsg.txt
+1
-1
sql/share/spanish/errmsg.txt
sql/share/spanish/errmsg.txt
+1
-1
sql/share/swedish/errmsg.txt
sql/share/swedish/errmsg.txt
+1
-1
sql/share/ukrainian/errmsg.txt
sql/share/ukrainian/errmsg.txt
+1
-1
No files found.
sql/mysqld.cc
View file @
77346b1d
...
...
@@ -2614,6 +2614,9 @@ server.");
printf
(
ER
(
ER_READY
),
my_progname
,
server_version
,
((
unix_sock
==
INVALID_SOCKET
)
?
(
char
*
)
""
:
mysql_unix_port
),
mysql_port
);
if
(
MYSQL_COMPILATION_COMMENT
[
0
]
!=
'\0'
)
fputs
(
" "
MYSQL_COMPILATION_COMMENT
,
stdout
);
putchar
(
'\n'
);
fflush
(
stdout
);
#ifdef __NT__
...
...
This diff is collapsed.
Click to expand it.
sql/share/czech/errmsg.txt
View file @
77346b1d
...
...
@@ -86,7 +86,7 @@
"Blob sloupec '%-.64s' nem-Be bt pouit jako kl",
"P-Bli velk dlka sloupce '%-.64s' (nejvce %d). Pouijte BLOB",
"M-Bete mt pouze jedno AUTO pole a to mus bt definovno jako kl",
"%s: p-Bipraven na spojen
\n
",
"%s: p-Bipraven na spojen",
"%s: norm-Bln ukonen\n",
"%s: p-Bijat signal %d, konm\n",
"%s: ukon-Ben prce hotovo\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/danish/errmsg.txt
View file @
77346b1d
...
...
@@ -80,7 +80,7 @@
"BLOB feltet '%-.64s' kan ikke bruges ved specifikation af indeks",
"For stor feltlængde for kolonne '%-.64s' (maks = %d). Brug BLOB i stedet",
"Der kan kun specificeres eet AUTO_INCREMENT-felt, og det skal være indekseret",
"%s: klar til tilslutninger
\n
",
"%s: klar til tilslutninger",
"%s: Normal nedlukning\n",
"%s: Fangede signal %d. Afslutter!!\n",
"%s: Server lukket\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/dutch/errmsg.txt
View file @
77346b1d
...
...
@@ -88,7 +88,7 @@
"BLOB kolom '%-.64s' kan niet gebruikt worden bij zoeksleutel specificatie",
"Te grote kolomlengte voor '%-.64s' (max = %d). Maak hiervoor gebruik van het type BLOB",
"Er kan slechts 1 autofield zijn en deze moet als zoeksleutel worden gedefinieerd.",
"%s: klaar voor verbindingen
\n
",
"%s: klaar voor verbindingen",
"%s: Normaal afgesloten \n",
"%s: Signaal %d. Systeem breekt af!\n",
"%s: Afsluiten afgerond\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/english/errmsg.txt
View file @
77346b1d
...
...
@@ -77,7 +77,7 @@
"BLOB column '%-.64s' can't be used in key specification with the used table type",
"Too big column length for column '%-.64s' (max = %d). Use BLOB instead",
"Incorrect table definition; There can only be one auto column and it must be defined as a key",
"%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d
\n
",
"%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d",
"%s: Normal shutdown\n",
"%s: Got signal %d. Aborting!\n",
"%s: Shutdown Complete\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/estonian/errmsg.txt
View file @
77346b1d
...
...
@@ -82,7 +82,7 @@
"BLOB-tpi tulpa '%-.64s' ei saa kasutada vtmena",
"Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %d). Kasuta BLOB vljatpi",
"Vigane tabelikirjeldus; Tabelis tohib olla ks auto_increment tpi tulp ning see peab olema defineeritud vtmena",
"%s: ootab hendusi
\n
",
"%s: ootab hendusi",
"%s: MySQL lpetas\n",
"%s: sain signaali %d. Lpetan!\n",
"%s: Lpp\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/french/errmsg.txt
View file @
77346b1d
...
...
@@ -77,7 +77,7 @@
"Champ BLOB '%-.64s' ne peut être utilisé dans une clé",
"Champ '%-.64s' trop long (max = %d). Utilisez un BLOB",
"Un seul champ automatique est permis et il doit être indexé",
"%s: Prêt pour des connections
\n
",
"%s: Prêt pour des connections",
"%s: Arrêt normal du serveur\n",
"%s: Reçu le signal %d. Abandonne!\n",
"%s: Arrêt du serveur terminé\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/german/errmsg.txt
View file @
77346b1d
...
...
@@ -80,7 +80,7 @@
"BLOB-Feld '%-.64s' kann nicht als Schlüssel verwendet werden.",
"Feldlänge für Feld '%-.64s' zu groß (max = %d). BLOB-Feld verwenden!",
"Nur ein Auto-Feld möglich, welches als Schlüssel definiert werden muß.",
"%-.64s: Warten auf Verbindungen
.\n
",
"%-.64s: Warten auf Verbindungen",
"%-.64s: Normal beendet.\n",
"%-.64s: Signal %d erhalten. Abbruch!\n",
"%-.64s: Shutdown ausgeführt.\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/greek/errmsg.txt
View file @
77346b1d
...
...
@@ -77,7 +77,7 @@
" Blob '%-.64s' (key specification)",
" '%-.64s' (max = %d). BLOB",
" auto field key",
"%s:
\n
",
"%s: ",
"%s: shutdown\n",
"%s: %d. !\n",
"%s: Shutdown \n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/hungarian/errmsg.txt
View file @
77346b1d
...
...
@@ -79,7 +79,7 @@
"Blob objektum '%-.64s' nem hasznalhato kulcskent",
"A(z) '%-.64s' oszlop tul hosszu. (maximum = %d). Hasznaljon BLOB tipust inkabb.",
"Csak egy auto mezo lehetseges, es azt kulcskent kell definialni.",
"%s: kapcsolatra kesz
\n
",
"%s: kapcsolatra kesz",
"%s: Normal leallitas\n",
"%s: %d jelzes. Megszakitva!\n",
"%s: A leallitas kesz\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/japanese/errmsg.txt
View file @
77346b1d
...
...
@@ -79,7 +79,7 @@
"BLOB column '%-.64s' can't be used in key specification with the used table type",
"column '%-.64s' は,確保する column の大きさが多すぎます. (最大 %d まで). BLOB をかわりに使用してください.",
"テーブルの定義が違います; There can only be one auto column and it must be defined as a key",
"%s: 準備完了
\n
",
"%s: 準備完了",
"%s: Normal shutdown\n",
"%s: Got signal %d. 中断!\n",
"%s: Shutdown 完了\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/korean/errmsg.txt
View file @
77346b1d
...
...
@@ -77,7 +77,7 @@
"BLOB 칼럼 '%-.64s'는 키 정의에서 사용될 수 없습니다.",
"칼럼 '%-.64s'의 칼럼 길이가 너무 깁니다 (최대 = %d). 대신에 BLOB를 사용하세요.",
"부정확한 테이블 정의; 테이블은 하나의 auto 칼럼이 존재하고 키로 정의되어져야 합니다.",
"%s: 연결 준비중입니다
.\n
",
"%s: 연결 준비중입니다",
"%s: 정상적인 shutdown\n",
"%s: %d 신호가 들어왔음. 중지!\n",
"%s: Shutdown 이 완료됨!\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/norwegian-ny/errmsg.txt
View file @
77346b1d
...
...
@@ -79,7 +79,7 @@
"Blob kolonne '%-.64s' kan ikkje brukast ved spesifikasjon av nyklar",
"For stor nykkellengde for felt '%-.64s' (maks = %d). Bruk BLOB istadenfor",
"Bare eitt auto felt kan vre definert som nkkel.",
"%s: klar for tilkoblingar
\n
",
"%s: klar for tilkoblingar",
"%s: Normal nedkopling\n",
"%s: Oppdaga signal %d. Avsluttar!\n",
"%s: Nedkopling komplett\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/norwegian/errmsg.txt
View file @
77346b1d
...
...
@@ -79,7 +79,7 @@
"Blob felt '%-.64s' kan ikke brukes ved spesifikasjon av nøkler",
"For stor nøkkellengde for kolonne '%-.64s' (maks = %d). Bruk BLOB istedenfor",
"Bare ett auto felt kan være definert som nøkkel.",
"%s: klar for tilkoblinger
\n
",
"%s: klar for tilkoblinger",
"%s: Normal avslutning\n",
"%s: Oppdaget signal %d. Avslutter!\n",
"%s: Avslutning komplett\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/polish/errmsg.txt
View file @
77346b1d
...
...
@@ -81,7 +81,7 @@
"Kolumna typu Blob '%-.64s' nie moe by uyta w specyfikacji klucza",
"Zbyt dua dugo? kolumny '%-.64s' (maks. = %d). W zamian uyj typu BLOB",
"W tabeli moe by tylko jedno pole auto i musi ono by zdefiniowane jako klucz",
"%s: gotowe do po?czenia\
n"
,
"%s: gotowe do po?czenia",
"%s: Standardowe zakoczenie dziaania\n",
"%s: Otrzymano sygna %d. Koczenie dziaania!\n",
"%s: Zakoczenie dziaania wykonane\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/portuguese/errmsg.txt
View file @
77346b1d
...
...
@@ -77,7 +77,7 @@
"Coluna BLOB '%-.64s' não pode ser utilizada na especificação de chave para o tipo de tabela usado",
"Comprimento da coluna '%-.64s' grande demais (max = %d). Use BLOB em seu lugar",
"Definição incorreta de tabela. Somente é permitido um único campo auto-incrementado e ele tem que ser definido como chave",
"%s: Pronto para conexões
\n
",
"%s: Pronto para conexões",
"%s: 'Shutdown' normal\n",
"%s: Obteve sinal %d. Abortando!\n",
"%s: 'Shutdown' completo\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/romanian/errmsg.txt
View file @
77346b1d
...
...
@@ -81,7 +81,7 @@
"Coloana de tip BLOB '%-.64s' nu poate fi folosita in specificarea cheii cu tipul de tabla folosit",
"Lungimea coloanei '%-.64s' este prea lunga (maximum = %d). Foloseste BLOB mai bine",
"Definitia tabelei este incorecta; Nu pot fi mai mult de o singura coloana de tip auto si aceasta trebuie definita ca cheie",
"%s: sint gata pentru conectii
\n
",
"%s: sint gata pentru conectii",
"%s: Terminare normala\n",
"%s: Semnal %d obtinut. Aborting!\n",
"%s: Terminare completa\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/russian/errmsg.txt
View file @
77346b1d
...
...
@@ -79,7 +79,7 @@
" BLOB '%-.64s' ",
" '%-.64s' ( = %d). BLOB ",
" : , ",
"%s: .\n: '%s' : '%s' : %d\n",
"%s: .\n: '%s' : '%s' : %d",
"%s: \n",
"%s: %d. !\n",
"%s: \n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/slovak/errmsg.txt
View file @
77346b1d
...
...
@@ -85,7 +85,7 @@
"Blob pole '%-.64s' neme by pouit ako k",
"Prli vek dka pre pole '%-.64s' (maximum = %d). Pouite BLOB",
"Mete ma iba jedno AUTO pole a to mus by definovan ako k",
"%s: pripraven na spojenie
\n
",
"%s: pripraven na spojenie",
"%s: normlne ukonenie\n",
"%s: prijat signl %d, ukonenie (Abort)!\n",
"%s: prca ukonen\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/spanish/errmsg.txt
View file @
77346b1d
...
...
@@ -78,7 +78,7 @@
"La columna Blob '%-.64s' no puede ser usada en una declaracion de clave",
"Longitud de columna demasiado grande para la columna '%-.64s' (maximo = %d).Usar BLOB en su lugar",
"Puede ser solamente un campo automatico y este debe ser definido como una clave",
"%s: preparado para conexiones
\n
",
"%s: preparado para conexiones",
"%s: Apagado normal\n",
"%s: Recibiendo signal %d. Abortando!\n",
"%s: Apagado completado\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/swedish/errmsg.txt
View file @
77346b1d
...
...
@@ -77,7 +77,7 @@
"En BLOB '%-.64s' kan inte vara nyckel med den använda tabelltypen",
"För stor kolumnlängd angiven för '%-.64s' (max= %d). Använd en BLOB instället",
"Det får finnas endast ett AUTO_INCREMENT-fält och detta måste vara en nyckel",
"%s: klar att ta emot klienter
\n
",
"%s: klar att ta emot klienter",
"%s: Normal avslutning\n",
"%s: Fick signal %d. Avslutar!\n",
"%s: Avslutning klar\n",
...
...
This diff is collapsed.
Click to expand it.
sql/share/ukrainian/errmsg.txt
View file @
77346b1d
...
...
@@ -82,7 +82,7 @@
"BLOB '%-.64s' Φ Ц æ",
" '%-.64s' (max = %d). BLOB",
"צ æ; , ",
"%s: '!
\n
",
"%s: '!",
"%s: \n",
"%s: %d. !\n",
"%s: \n",
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment