summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-11-30 22:57:18 +0200
committerMichael Widenius <monty@askmonty.org>2011-11-30 22:57:18 +0200
commitefcfb195e3fc4a2b87bfcb9ad136d46b9961f49e (patch)
tree9eb3b78e20ecf4bd9e5cd587db50d51c1f06d336 /server-tools
parenta7f87effa57f6486c23bf5b340c8474a635dcf71 (diff)
parent6378bdbf47af72b2f899853586faa5a2d2f0fee1 (diff)
downloadmariadb-git-efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e.tar.gz
Merge with 5.1
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/guardian.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc
index b49b0ec0a00..1df602534e0 100644
--- a/server-tools/instance-manager/guardian.cc
+++ b/server-tools/instance-manager/guardian.cc
@@ -440,7 +440,7 @@ void Guardian::stop_instances()
/* Request mysqld to stop. */
- bool instance_stopped= FALSE;
+ bool instance_stopped __attribute__((unused))= FALSE;
for (int cur_attempt= 0; cur_attempt < NUM_STOP_ATTEMPTS; ++cur_attempt)
{