summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/instance.cc
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2004-12-12 20:59:15 +0300
committerunknown <petr@mysql.com>2004-12-12 20:59:15 +0300
commit596876f920c3d8dddbd3616ea45da915bc2bd0d2 (patch)
tree2ef9fe482b395f3c801020e3a2ea6dab7af57434 /server-tools/instance-manager/instance.cc
parent57867f07b4ed7d758e9d2821edbeec48f92078a2 (diff)
downloadmariadb-git-596876f920c3d8dddbd3616ea45da915bc2bd0d2.tar.gz
fix autobuild failures
server-tools/instance-manager/buffer.cc: fix typo server-tools/instance-manager/commands.cc: get rid of compiler warnings server-tools/instance-manager/guardian.cc: fix compiler warning server-tools/instance-manager/instance.cc: fix warnings server-tools/instance-manager/instance_map.cc: fix return value server-tools/instance-manager/instance_map.h: fix problem, caused autobuild failure. Looks like a gcc problem - "friend class <name>" doesn't work if specified before enclosed class <name> (this is not present in newer gcc versions)
Diffstat (limited to 'server-tools/instance-manager/instance.cc')
-rw-r--r--server-tools/instance-manager/instance.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index 42909a134ac..58bc5b85dd8 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -88,8 +88,8 @@ Instance::~Instance()
bool Instance::is_running()
{
- uint port;
- const char *socket;
+ uint port= 0;
+ const char *socket= NULL;
if (options.mysqld_port)
port= atoi(strchr(options.mysqld_port, '=') + 1);