Commit d976f87f 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 7c3f55ec 85834c3b

server-tools/instance-manager/commands.cc

+7 −3
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ int Show_instance_log::execute(struct st_net *net, ulong connection_id) 
      int read_len;

      /* calculate buffer size */

      MY_STAT file_stat;

      Buffer read_buff;



      /* my_fstat doesn't use the flag parameter */

      if (my_fstat(fd, &file_stat, MYF(0)))
@@ -478,13 +479,16 @@ int Show_instance_log::execute(struct st_net *net, ulong connection_id) 


      buff_size= (size - offset);



      read_buff.reserve(0, buff_size);



      /* read in one chunk */

      read_len= my_seek(fd, file_stat.st_size - size, MY_SEEK_SET, MYF(0));



      char *bf= (char*) malloc(sizeof(char)*buff_size);

      if ((read_len= my_read(fd, (byte*)bf, buff_size, MYF(0))) < 0)

      if ((read_len= my_read(fd, (byte*) read_buff.buffer,

                             buff_size, MYF(0))) < 0)

        return ER_READ_FILE;

      store_to_protocol_packet(&send_buff, (char*) bf, &position, read_len);

      store_to_protocol_packet(&send_buff, read_buff.buffer,

                               &position, read_len);

      close(fd);

    }

    else

server-tools/instance-manager/guardian.cc

+2 −12
Original line number Diff line number Diff line
@@ -424,23 +424,13 @@ int Guardian_thread::stop_instances(bool stop_instances_arg) 
}





int Guardian_thread::lock()

void Guardian_thread::lock()

{

#ifdef __WIN__

  pthread_mutex_lock(&LOCK_guardian); 

  return 0;

#else

  return pthread_mutex_lock(&LOCK_guardian);

#endif

}





int Guardian_thread::unlock()

void Guardian_thread::unlock()

{

#ifdef __WIN__

  pthread_mutex_unlock(&LOCK_guardian);

  return 0;

#else

  return pthread_mutex_unlock(&LOCK_guardian);

#endif

}

server-tools/instance-manager/guardian.h

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ class Guardian_thread: public Guardian_thread_args 
  int stop_guard(Instance *instance);

  /* Returns true if guardian thread is stopped */

  int is_stopped();

  int lock();

  int unlock();

  void lock();

  void unlock();



public:

  pthread_cond_t COND_guardian;

server-tools/instance-manager/instance_map.cc

+2 −12
Original line number Diff line number Diff line
@@ -137,25 +137,15 @@ Instance_map::~Instance_map() 
}





int Instance_map::lock()

void Instance_map::lock()

{

#ifdef __WIN__

  pthread_mutex_lock(&LOCK_instance_map);

  return 0;

#else

  return pthread_mutex_lock(&LOCK_instance_map);

#endif

}





int Instance_map::unlock()

void Instance_map::unlock()

{

#ifdef __WIN__

  pthread_mutex_unlock(&LOCK_instance_map);

  return 0;

#else

  return pthread_mutex_unlock(&LOCK_instance_map);

#endif

}

server-tools/instance-manager/instance_map.h

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ class Instance_map 
  Instance *find(const char *name, uint name_len);



  int flush_instances();

  int lock();

  int unlock();

  void lock();

  void unlock();

  int init();



  Instance_map(const char *default_mysqld_path_arg);