summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/commands.cc
diff options
context:
space:
mode:
authorpetr@mysql.com <>2005-06-01 04:40:22 +0400
committerpetr@mysql.com <>2005-06-01 04:40:22 +0400
commitc7581758ece924c94b1798cb9f97ef73d37b2223 (patch)
tree9ad013e8ea02fb9d7bc9887be150da9b869ae2b7 /server-tools/instance-manager/commands.cc
parent329d974df743975d4f898dbb8fc7a31fca818f6b (diff)
downloadmariadb-git-c7581758ece924c94b1798cb9f97ef73d37b2223.tar.gz
fix IM to display version string in "show instance status" (Bug #10229)
Diffstat (limited to 'server-tools/instance-manager/commands.cc')
-rw-r--r--server-tools/instance-manager/commands.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc
index 77c26fd28de..737eb47bdf6 100644
--- a/server-tools/instance-manager/commands.cc
+++ b/server-tools/instance-manager/commands.cc
@@ -203,15 +203,14 @@ int Show_instance_status::execute(struct st_net *net,
if (!(instance= instance_map->find(instance_name, strlen(instance_name))))
goto err;
if (instance->is_running())
- {
store_to_string(&send_buff, (char*) "online", &position);
- store_to_string(&send_buff, "unknown", &position);
- }
else
- {
store_to_string(&send_buff, (char*) "offline", &position);
+
+ if (instance->options.mysqld_version)
+ store_to_string(&send_buff, instance->options.mysqld_version, &position);
+ else
store_to_string(&send_buff, (char*) "unknown", &position);
- }
if (send_buff.is_error() ||