diff options
| author | unknown <serg@serg.mylan> | 2004-11-28 18:19:01 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-28 18:19:01 +0100 |
| commit | dd33501f9eb87d0004034aa01bd80a3d56934ad2 (patch) | |
| tree | 304569af7cace94b402f78a4a7af73ac6e4e838a /innobase | |
| parent | 5607539c5b5dee4809e8e370527d3542387e27a4 (diff) | |
| parent | 59abcd447cc373c1c3dfc0184f12642aa6d2ab70 (diff) | |
| download | mariadb-git-dd33501f9eb87d0004034aa01bd80a3d56934ad2.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
innobase/srv/srv0srv.c:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/srv/srv0srv.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index b8d03cfab5f..84e3886162a 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1677,11 +1677,13 @@ loop: srv_printf_innodb_monitor(stderr); } - mutex_enter(&srv_monitor_file_mutex); - rewind(srv_monitor_file); - srv_printf_innodb_monitor(srv_monitor_file); - os_file_set_eof(srv_monitor_file); - mutex_exit(&srv_monitor_file_mutex); + if (srv_innodb_status) { + mutex_enter(&srv_monitor_file_mutex); + rewind(srv_monitor_file); + srv_printf_innodb_monitor(srv_monitor_file); + os_file_set_eof(srv_monitor_file); + mutex_exit(&srv_monitor_file_mutex); + } if (srv_print_innodb_tablespace_monitor && difftime(current_time, last_table_monitor_time) > 60) { |