Commit 8d2cf738 authored by unknown's avatar unknown
Browse files

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/cps/mysql/trees/mysql-5.0
parents 06a948c3 4a43ecca

server-tools/instance-manager/buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class Buffer 


  ~Buffer()

  {

    free(buffer);

    my_free(buffer, MYF(0));

  }



public:

server-tools/instance-manager/commands.cc

+4 −9
Original line number Diff line number Diff line
@@ -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() ||
@@ -645,10 +644,6 @@ Set_option::Set_option(Instance_map *instance_map_arg, 
    {

      strmake(option, option_arg, option_len_arg);

      strmake(option_value, option_value_arg, option_value_len_arg);

/*    strncpy(option, option_arg, option_len_arg);

      option[option_len_arg]= 0;

      strncpy(option_value, option_value_arg, option_value_len_arg);

      option_value[option_value_len_arg]= 0; */

    }

    else

    {

server-tools/instance-manager/instance.cc

+2 −2
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ int Instance::init(const char *name_arg) 


int Instance::complete_initialization(Instance_map *instance_map_arg,

                                      const char *mysqld_path,

                                      int only_instance)

                                      uint instance_type)

{

  instance_map= instance_map_arg;

  return options.complete_initialization(mysqld_path, only_instance);

  return options.complete_initialization(mysqld_path, instance_type);

}

server-tools/instance-manager/instance.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class Instance 
  ~Instance();

  int init(const char *name);

  int complete_initialization(Instance_map *instance_map_arg,

                              const char *mysqld_path, int only_instance= 0);

                              const char *mysqld_path, uint instance_type);



  bool is_running();

  int start();

server-tools/instance-manager/instance_map.cc

+2 −2
Original line number Diff line number Diff line
@@ -202,14 +202,14 @@ int Instance_map::complete_initialization() 
      hash_free should handle it's deletion => goto err, not

      err_instance.

    */

    if (instance->complete_initialization(this, mysqld_path, 1))

    if (instance->complete_initialization(this, mysqld_path, DEFAULT_SINGLE_INSTANCE))

      goto err;

  }

  else

    while (i < hash.records)

    {

      instance= (Instance *) hash_element(&hash, i);

      if (instance->complete_initialization(this, mysqld_path))

      if (instance->complete_initialization(this, mysqld_path, USUAL_INSTANCE))

        goto err;

      i++;

    }