From 933025b0176f33f44b77f0bd9d897eceb1212e5f Mon Sep 17 00:00:00 2001
From: MassimilianoPinto <massimiliano.pinto@skysql.com>
Date: Mon, 26 May 2014 16:49:10 +0200
Subject: [PATCH] Update

Update
---
 server/core/server.c    | 11 +++++++++--
 server/include/server.h |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/core/server.c b/server/core/server.c
index 27ed23b75..1a81ddb6a 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -68,6 +68,7 @@ SERVER 	*server;
 	server->nextdb = NULL;
 	server->monuser = NULL;
 	server->monpw = NULL;
+	server->server_string = NULL;
 	server->node_id = -1;
 
 	spinlock_acquire(&server_spin);
@@ -111,6 +112,8 @@ SERVER *ptr;
 	/* Clean up session and free the memory */
 	free(server->name);
 	free(server->protocol);
+	if (server->server_string)
+		free(server->server_string);
 	free(server);
 	return 1;
 }
@@ -199,9 +202,11 @@ char	*stat;
 		free(stat);
 		dcb_printf(dcb, "\tProtocol:		%s\n", ptr->protocol);
 		dcb_printf(dcb, "\tPort:			%d\n", ptr->port);
+		if (ptr->server_string)
+			dcb_printf(dcb, "\tServer Version:\t\t%s\n", ptr->server_string);
 		dcb_printf(dcb, "\tNode Id:			%d\n", ptr->node_id);
 		dcb_printf(dcb, "\tNumber of connections:	%d\n", ptr->stats.n_connections);
-		dcb_printf(dcb, "\tCurrent no. of connections:	%d\n", ptr->stats.n_current);
+		dcb_printf(dcb, "\tCurrent no. of conns:	%d\n", ptr->stats.n_current);
 		ptr = ptr->next;
 	}
 	spinlock_release(&server_spin);
@@ -225,9 +230,11 @@ char	*stat;
 	free(stat);
 	dcb_printf(dcb, "\tProtocol:		%s\n", server->protocol);
 	dcb_printf(dcb, "\tPort:			%d\n", server->port);
+	if (server->server_string)
+		dcb_printf(dcb, "\tServer Version:\t\t%s\n", server->server_string);
 	dcb_printf(dcb, "\tNode Id:			%d\n", server->node_id);
 	dcb_printf(dcb, "\tNumber of connections:	%d\n", server->stats.n_connections);
-	dcb_printf(dcb, "\tCurrent No. of connections:	%d\n", server->stats.n_current);
+	dcb_printf(dcb, "\tCurrent No. of conns:	%d\n", server->stats.n_current);
 }
 
 /**
diff --git a/server/include/server.h b/server/include/server.h
index 6e7b146d1..f6de85ab7 100644
--- a/server/include/server.h
+++ b/server/include/server.h
@@ -61,6 +61,7 @@ typedef struct server {
 	SERVER_STATS	stats;		/**< The server statistics */
 	struct	server	*next;		/**< Next server */
 	struct	server	*nextdb;	/**< Next server in list attached to a service */
+	char		*server_string;	/**< Server version string, i.e. MySQL server version */
 	long		node_id;	/**< Node id, server_id for M/S or local_index for Galera */
 } SERVER;