Commit 80588dcf authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

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


sql/mysqld.cc:
  Auto merged
parents cd496183 bfbc7595

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -3148,7 +3148,7 @@ we force server id to 2, but this MySQL server will not act as a slave."); 
  create_shutdown_thread();

  create_maintenance_thread();



  sql_print_information(ER(ER_READY),my_progname,server_version,

  sql_print_information(ER(ER_STARTUP),my_progname,server_version,

                        ((unix_sock == INVALID_SOCKET) ? (char*) ""

                                                       : mysqld_unix_port),

                         mysqld_port,

sql/share/errmsg.txt

+3 −1
Original line number Diff line number Diff line
@@ -1824,7 +1824,7 @@ ER_READY 
	cze "%s: p-Bipraven na spojen"

	dan "%s: klar til tilslutninger"

	nla "%s: klaar voor verbindingen"

	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d  %s"

	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d"

	jps "%s: ",

	est "%s: ootab hendusi"

	fre "%s: Prt pour des connections"
@@ -5328,3 +5328,5 @@ ER_DATA_TOO_LONG 22001 
	eng "Data too long for column '%s' at row %ld"

ER_SP_BAD_SQLSTATE 42000

	eng "Bad SQLSTATE: '%s'"

ER_STARTUP

	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d  %s"