Post-merge fixes.

2 files changed, 10 insertions, 10 deletions

diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc
index 9fc3a6583ef..af57f1decbc 100644
--- a/server-tools/instance-manager/guardian.cc
+++ b/server-tools/instance-manager/guardian.cc
@@ -158,7 +158,7 @@ void Guardian_thread::process_instance(Instance *instance,
     {
       /* clear status fields */
       log_info("guardian: instance '%s' is running, set state to STARTED.",
-               (const char *) instance->options.instance_name);
+               (const char *) instance->options.instance_name.str);
       current_node->restart_counter= 0;
       current_node->crash_moment= 0;
       current_node->state= STARTED;
@@ -169,7 +169,7 @@ void Guardian_thread::process_instance(Instance *instance,
     switch (current_node->state) {
     case NOT_STARTED:
       log_info("guardian: starting instance '%s'...",
-               (const char *) instance->options.instance_name);
+               (const char *) instance->options.instance_name.str);
 
       /* NOTE, set state to STARTING _before_ start() is called */
       current_node->state= STARTING;
@@ -194,7 +194,7 @@ void Guardian_thread::process_instance(Instance *instance,
         {
           instance->start();
           log_info("guardian: starting instance '%s'...",
-                   (const char *) instance->options.instance_name);
+                   (const char *) instance->options.instance_name.str);
         }
       }
       else
@@ -212,13 +212,13 @@ void Guardian_thread::process_instance(Instance *instance,
             current_node->last_checked= current_time;
             current_node->restart_counter++;
             log_info("guardian: restarting instance '%s'...",
-                     (const char *) instance->options.instance_name);
+                     (const char *) instance->options.instance_name.str);
           }
         }
         else
         {
           log_info("guardian: cannot start instance %s. Abandoning attempts "
-                   "to (re)start it", instance->options.instance_name);
+                   "to (re)start it", instance->options.instance_name.str);
           current_node->state= CRASHED_AND_ABANDONED;
         }
       }
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();
       }