Commit 84381afb authored by unknown's avatar unknown

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

into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
parents af529fd1 239543f7
...@@ -3147,13 +3147,11 @@ we force server id to 2, but this MySQL server will not act as a slave."); ...@@ -3147,13 +3147,11 @@ we force server id to 2, but this MySQL server will not act as a slave.");
create_shutdown_thread(); create_shutdown_thread();
create_maintenance_thread(); create_maintenance_thread();
printf(ER(ER_READY),my_progname,server_version, sql_print_information(ER(ER_READY),my_progname,server_version,
((unix_sock == INVALID_SOCKET) ? (char*) "" : mysqld_unix_port), ((unix_sock == INVALID_SOCKET) ? (char*) ""
mysqld_port); : mysqld_unix_port),
if (MYSQL_COMPILATION_COMMENT[0] != '\0') mysqld_port,
fputs(" " MYSQL_COMPILATION_COMMENT, stdout); MYSQL_COMPILATION_COMMENT);
putchar('\n');
fflush(stdout);
#if defined(__NT__) || defined(HAVE_SMEM) #if defined(__NT__) || defined(HAVE_SMEM)
handle_connections_methods(); handle_connections_methods();
......
...@@ -1824,7 +1824,7 @@ ER_READY ...@@ -1824,7 +1824,7 @@ ER_READY
cze "%s: p-Bipraven na spojen" cze "%s: p-Bipraven na spojen"
dan "%s: klar til tilslutninger" dan "%s: klar til tilslutninger"
nla "%s: klaar voor verbindingen" nla "%s: klaar voor verbindingen"
eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d" eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d %s"
jps "%s: ", jps "%s: ",
est "%s: ootab hendusi" est "%s: ootab hendusi"
fre "%s: Prt pour des connections" fre "%s: Prt pour des connections"
...@@ -1839,7 +1839,7 @@ ER_READY ...@@ -1839,7 +1839,7 @@ ER_READY
pol "%s: gotowe do po?czenia" pol "%s: gotowe do po?czenia"
por "%s: Pronto para conexes" por "%s: Pronto para conexes"
rum "%s: sint gata pentru conectii" rum "%s: sint gata pentru conectii"
rus "%s: .\n: '%s' : '%s' : %d" rus "%s: .\n: '%s' : '%s' : %d %s"
serbian "%s: Spreman za konekcije\n" serbian "%s: Spreman za konekcije\n"
slo "%s: pripraven na spojenie" slo "%s: pripraven na spojenie"
spa "%s: preparado para conexiones" spa "%s: preparado para conexiones"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment