WL #3516: MySQL Enterprise: implement Version Display Specification

Print version_comment after server version in:
mysql.cc:  Welcome message and 'status' command output
log.cc: Top of log files


client/mysql.cc:
  Add server_version_string() function to return a buffer with the server version and version_comment combined.
  Use server_version_string() instead of mysql_get_server_info() for Welcome! message and 'status' command
sql/log.cc:
  MYSQL_LOG::open():
  - print MYSQL_COMPILATION_COMMENT after the server_version at the top of log files

1 files changed, 7 insertions, 4 deletions

diff --git a/sql/log.cc b/sql/log.cc
index 1cd01865f9f..212c6403666 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -566,15 +566,18 @@ bool MYSQL_LOG::open(const char *log_name,
   case LOG_NORMAL:
   {
     char *end;
-    int len=my_snprintf(buff, sizeof(buff), "%s, Version: %s. "
+    int len=my_snprintf(buff, sizeof(buff), "%s, Version: %s (%s). "
 #ifdef EMBEDDED_LIBRARY
-		        "embedded library\n", my_progname, server_version
+		        "embedded library\n",
+                        my_progname, server_version, MYSQL_COMPILATION_COMMENT
 #elif __NT__
 			"started with:\nTCP Port: %d, Named Pipe: %s\n",
-			my_progname, server_version, mysqld_port, mysqld_unix_port
+			my_progname, server_version, MYSQL_COMPILATION_COMMENT,
+                        mysqld_port, mysqld_unix_port
 #else
 			"started with:\nTcp port: %d  Unix socket: %s\n",
-			my_progname,server_version,mysqld_port,mysqld_unix_port
+			my_progname, server_version, MYSQL_COMPILATION_COMMENT,
+                        mysqld_port, mysqld_unix_port
 #endif
                        );
     end=strnmov(buff+len,"Time                 Id Command    Argument\n",