diff options
author | unknown <marko@hundin.mysql.fi> | 2005-03-08 16:02:13 +0200 |
---|---|---|
committer | unknown <marko@hundin.mysql.fi> | 2005-03-08 16:02:13 +0200 |
commit | b80ec98e28fdf4c72f0e62d781183b468e8bfb65 (patch) | |
tree | e498116e24a4f56150eff0f4f00844c5cba0725a /innobase | |
parent | 3330dfb390c8c585e69914ced80048969e9df06b (diff) | |
parent | c409a646b1180f47c7cec5b43028c5768dcfbfa9 (diff) | |
download | mariadb-git-b80ec98e28fdf4c72f0e62d781183b468e8bfb65.tar.gz |
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
Diffstat (limited to 'innobase')
-rw-r--r-- | innobase/include/srv0srv.h | 1 | ||||
-rw-r--r-- | innobase/srv/srv0srv.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index b5604f952c7..4e9e25844aa 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -111,6 +111,7 @@ extern ibool srv_use_doublewrite_buf; extern ibool srv_set_thread_priorities; extern int srv_query_thread_priority; +extern ulong srv_max_buf_pool_modified_pct; extern ulong srv_max_purge_lag; extern ibool srv_use_awe; extern ibool srv_use_adaptive_hash_indexes; diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 0c888d7de72..a60e9e5a5f7 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -184,7 +184,7 @@ in the buffer pool to all database pages in the buffer pool smaller than the following number. But it is not guaranteed that the value stays below that during a time of heavy update/insert activity. */ -ulint srv_max_buf_pool_modified_pct = 90; +ulong srv_max_buf_pool_modified_pct = 90; /* If the following is != 0 we do not allow inserts etc. This protects the user from forgetting the innodb_force_recovery keyword to my.cnf */ |