diff options
| author | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
| commit | d21d49a32a1689d2c486a449574e120d7a2f60c4 (patch) | |
| tree | 3238bd16530e02dbfef96513749a73b7294880f8 /innobase/srv | |
| parent | 104fdf607d312bb13f24063d28d993243bf24ca2 (diff) | |
| parent | e51887b05082622a1882217b7f8ec8ae7f6b4598 (diff) | |
| download | mariadb-git-d21d49a32a1689d2c486a449574e120d7a2f60c4.tar.gz | |
Merge with 4.0.19
Diffstat (limited to 'innobase/srv')
| -rw-r--r-- | innobase/srv/srv0srv.c | 5 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 73bbd145517..9dffdbf2f9f 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1655,6 +1655,11 @@ loop: mutex_enter(&srv_monitor_file_mutex); rewind(srv_monitor_file); srv_printf_innodb_monitor(srv_monitor_file); +#ifdef __WIN__ + chsize(fileno(srv_monitor_file), ftell(srv_monitor_file)); +#else /* __WIN__ */ + ftruncate(fileno(srv_monitor_file), ftell(srv_monitor_file)); +#endif /* __WIN__ */ mutex_exit(&srv_monitor_file_mutex); if (srv_print_innodb_tablespace_monitor diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index 33d84cfaa8e..68fcb82c6d8 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -1112,6 +1112,7 @@ NetWare. */ } mutex_create(&srv_monitor_file_mutex); + mutex_set_level(&srv_monitor_file_mutex, SYNC_NO_ORDER_CHECK); srv_monitor_file_name = mem_alloc( strlen(fil_path_to_mysql_datadir) + 20 + sizeof "/innodb_status."); |