From 66b872805cbd542c6012eef7141443d95a697f7d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Oct 2006 20:08:00 +0400 Subject: Post-merge fixes. mysql-test/r/sp.result: Update results. mysql-test/r/view.result: Update results. server-tools/instance-manager/guardian.cc: Post-merge fixes (instance_name is a LEX_STRING). server-tools/instance-manager/instance.cc: Post-merge fixes (instance_name is a LEX_STRING). --- server-tools/instance-manager/instance.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server-tools/instance-manager/instance.cc') diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index c4bd1e211e1..1dfe6167020 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -166,7 +166,7 @@ static int start_process(Instance_options *instance_options, exit(1); case -1: log_info("cannot create a new process to start instance '%s'.", - (const char *) instance_options->instance_name); + (const char *) instance_options->instance_name.str); return 1; } return 0; @@ -312,9 +312,9 @@ void Instance::remove_pid() int pid; if ((pid= options.get_pid()) != 0) /* check the pidfile */ if (options.unlink_pidfile()) /* remove stalled pidfile */ - log_error("cannot remove pidfile for instance '%s', this might be \ - since IM lacks permmissions or hasn't found the pidifle", - (const char *) options.instance_name); + log_error("cannot remove pidfile for instance '%s', this might be " + "since IM lacks permmissions or hasn't found the pidifle", + (const char *) options.instance_name.str); } @@ -620,7 +620,7 @@ void Instance::kill_instance(int signum) log_error("The instance '%s' is being stopped forcibly. Normally" "it should not happen. Probably the instance has been" "hanging. You should also check your IM setup", - (const char *) options.instance_name); + (const char *) options.instance_name.str); /* After sucessful hard kill the pidfile need to be removed */ options.unlink_pidfile(); } -- cgit v1.2.1