Commit 20433597 authored by nick@mysql.com's avatar nick@mysql.com
Browse files

Merge mysql.com:/home/nick/mysql/repository/mysql-3.23 

into mysql.com:/home/nick/mysql/mysql-3.23
parents 690cba1a ec04d284

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -30,3 +30,4 @@ zak@balfor.local 
bar@bar.mysql.r18.ru

paul@teton.kitebird.com

serg@build.mysql2.com

nick@mysql.com

sql/log.cc

+5 −5
Original line number Diff line number Diff line
@@ -513,11 +513,11 @@ bool MYSQL_LOG::is_active(const char* log_file_name) 


void MYSQL_LOG::new_file(bool inside_mutex)

{

  if (!inside_mutex)

    VOID(pthread_mutex_lock(&LOCK_log));

  if (is_open())

  {

    char new_name[FN_REFLEN], *old_name=name;

    if (!inside_mutex)

      VOID(pthread_mutex_lock(&LOCK_log));

 

    if (!no_rotate)

    {
@@ -550,10 +550,10 @@ void MYSQL_LOG::new_file(bool inside_mutex) 
    my_free(old_name,MYF(0));

    last_time=query_start=0;

    write_error=0;

  }

  if (!inside_mutex)

    VOID(pthread_mutex_unlock(&LOCK_log));

}

}





bool MYSQL_LOG::write(THD *thd,enum enum_server_command command,

sql/sql_parse.cc

+4 −4
Original line number Diff line number Diff line
@@ -2839,10 +2839,10 @@ bool reload_acl_and_cache(THD *thd, uint options, TABLE_LIST *tables) 
  }

  if (options & REFRESH_LOG)

  {

    mysql_log.new_file();

    mysql_update_log.new_file();

    mysql_bin_log.new_file();

    mysql_slow_log.new_file();

    mysql_log.new_file(0);

    mysql_update_log.new_file(0);

    mysql_bin_log.new_file(0);

    mysql_slow_log.new_file(0);

    if (ha_flush_logs())

      result=1;

  }