Commit b80ec98e authored by unknown's avatar unknown
Browse files

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
parents 3330dfb3 c409a646

innobase/include/srv0srv.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

innobase/srv/srv0srv.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */