Commit bfbc7595 authored by unknown's avatar unknown
Browse files

Fix change made to ER_READY by creating a new message, instead.


sql/mysqld.cc:
  Use new message for startup
sql/share/errmsg.txt:
  Revert change to ER_READY, add new ER_STARTUP to use instead
parent 08e23eb6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3147,7 +3147,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,
+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"