Commit 963e45b9 authored by unknown's avatar unknown
Browse files

Merge sand.box:/home/tim/m/40/bk into sand.box:/home/tim/m/40/a

parents f618dd6a 03daa16a

sql/mysqld.cc

+3 −0
Original line number Diff line number Diff line
@@ -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__

sql/share/czech/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -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",

sql/share/danish/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -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",

sql/share/dutch/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -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",

sql/share/english/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -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",