Commit c928894b authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
parents fb28f429 d1db2ebf

server-tools/instance-manager/mysql_connection.cc

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ int Mysql_connection_thread::check_user(const char *user, const char *password) 
int Mysql_connection_thread::do_command()

{

  char *packet;

  uint old_timeout;

  ulong packet_length;



  /* We start to count packets from 0 for each new command */

server-tools/instance-manager/parse.cc

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ Command *parse_command(Command_factory *factory, const char *text) 
  const char *instance_name;

  uint instance_name_len;

  Command *command;

  const char *saved_text= text;



  Token tok1= shift_token(&text, &word_len);

server-tools/instance-manager/thread_registry.cc

+3 −2
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ int Thread_registry::cond_wait(Thread_info *info, pthread_cond_t *cond, 


void Thread_registry::deliver_shutdown()

{

  Thread_info *info;

  struct timespec shutdown_time;

  set_timespec(shutdown_time, 1);
@@ -161,7 +162,7 @@ void Thread_registry::deliver_shutdown() 
    stopped alarm processing.

  */

  process_alarm(THR_SERVER_ALARM);

  for (Thread_info *info= head.next; info != &head; info= info->next)

  for (info= head.next; info != &head; info= info->next)

  {

    pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL);

    /*
@@ -190,7 +191,7 @@ void Thread_registry::deliver_shutdown() 
    so this time everybody should be informed (presumably each worker can

    get CPU during shutdown_time.)

  */

  for (Thread_info *info= head.next; info != &head; info= info->next)

  for (info= head.next; info != &head; info= info->next)

  {

    pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL);

    if (info->current_cond)

server-tools/instance-manager/user_map.cc

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ int User_map::load(const char *password_file_name) 
            1 +                               /* for ':' */

            1 +                               /* for newline */

            1];                               /* for trailing zero */

  uint line_length;

  User *user;

  int rc= 1;