diff options
| author | unknown <serg@serg.mylan> | 2004-11-28 20:42:04 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-28 20:42:04 +0100 |
| commit | 4e333a436fecef5b126ee9cc1ae74586f578ab59 (patch) | |
| tree | 73ac6d40766844cf3ca373cf0b7e4edf0a7a5be0 /innobase/srv/srv0srv.c | |
| parent | 0c36925141fe486d6add9deeffc59424ba492453 (diff) | |
| parent | ac11a9314bdec5ae1ebe182fc6ff35fcbeaec1b0 (diff) | |
| download | mariadb-git-4e333a436fecef5b126ee9cc1ae74586f578ab59.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/slave.cc:
Auto merged
mysql-test/r/select.result:
!bk-eb
mysql-test/t/select.test:
!bk-eb
Diffstat (limited to 'innobase/srv/srv0srv.c')
| -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 80aea50be2e..ba102b6f4b9 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1783,11 +1783,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) { |