mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
This commit is contained in:
unknown 2006-04-18 08:47:22 +04:00
commit 02519fd6ad
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sql/log.cc
View file

@ -676,20 +676,36 @@ bool LOGGER::flush_logs(THD *thd)
/* reopen log files */
file_log_handler->flush();
/*
this will lock and wait for all but the logger thread to release the
tables. Then we could reopen log tables. Then release the name locks.
*/
lock_and_wait_for_table_name(thd, &close_slow_log);
lock_and_wait_for_table_name(thd, &close_general_log);
/* flush tables, in the case they are enabled */
if (logger.is_log_tables_initialized)
{
/*
This will lock and wait for all but the logger thread to release the
tables. Then we could reopen log tables. Then release the name locks.
/* deny others from logging to general and slow log, while reopening tables */
logger.lock();
NOTE: in fact, the first parameter used in lock_and_wait_for_table_name()
and table_log_handler->flush() could be any non-NULL THD, as the
underlying code makes certain assumptions about this.
Here we use one of the logger handler THD's. Simply because it
seems appropriate.
*/
lock_and_wait_for_table_name(table_log_handler->general_log_thd,
&close_slow_log);
lock_and_wait_for_table_name(table_log_handler->general_log_thd,
&close_general_log);
table_log_handler->flush(thd, &close_slow_log, &close_general_log);
/*
Deny others from logging to general and slow log,
while reopening tables.
*/
logger.lock();
/* end of log tables flush */
logger.unlock();
table_log_handler->flush(table_log_handler->general_log_thd,
&close_slow_log, &close_general_log);
/* end of log tables flush */
logger.unlock();
}
return FALSE;
}