diff options
| author | heikki@hundin.mysql.fi <> | 2003-10-17 23:44:34 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-10-17 23:44:34 +0300 |
| commit | 91f5c5e3379869c82b1477a37cefe54be084f261 (patch) | |
| tree | 27c4cf6a0ebf62c4a01fd1fe3028b1d331e84e4a /innobase/include | |
| parent | 4aedeb3a607a51a3bc1476770842bb5e89fb1a18 (diff) | |
| download | mariadb-git-91f5c5e3379869c82b1477a37cefe54be084f261.tar.gz | |
thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h, ha_innodb.cc:
Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/os0thread.h | 11 | ||||
| -rw-r--r-- | innobase/include/srv0srv.h | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/innobase/include/os0thread.h b/innobase/include/os0thread.h index 491d8866af4..554ca0563e4 100644 --- a/innobase/include/os0thread.h +++ b/innobase/include/os0thread.h @@ -15,14 +15,9 @@ Created 9/8/1995 Heikki Tuuri /* Maximum number of threads which can be created in the program; this is also the size of the wait slot array for MySQL threads which can wait inside InnoDB */ -#if defined(__WIN__) || defined(__NETWARE__) -/* Create less event semaphores because Win 98/ME had difficult creating -40000 event semaphores */ -/* TODO: these just take a lot of memory on NetWare. should netware move up? */ -#define OS_THREAD_MAX_N 1000 -#else -#define OS_THREAD_MAX_N 10000 -#endif + +#define OS_THREAD_MAX_N srv_max_n_threads + /* Possible fixed priorities for threads */ #define OS_THREAD_PRIORITY_NONE 100 diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index f4255fc9a98..87df3904f19 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -80,6 +80,8 @@ extern ulint srv_max_dirty_pages_pct; extern ulint srv_force_recovery; extern ulint srv_thread_concurrency; +extern ulint srv_max_n_threads; + extern lint srv_conc_n_threads; extern ibool srv_fast_shutdown; |