diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 18:09:04 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 18:09:04 +0300 |
| commit | 5069a666709a66335ded54c6fab4832e155840c1 (patch) | |
| tree | 4d0f676967368da9dbb6b7ddde1033a278f2e17c /sql/mysqld.cc | |
| parent | 7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff (diff) | |
| parent | 709f49cbf780681bb74707c9ab2438f163747906 (diff) | |
| download | mariadb-git-5069a666709a66335ded54c6fab4832e155840c1.tar.gz | |
Automerge from mysql-5.1-bugteam to mysql-trunk-merge.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 560db3356d6..b9bcd407a19 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5681,6 +5681,7 @@ enum options_mysqld OPT_MYISAM_BLOCK_SIZE, OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE, OPT_MYISAM_MAX_SORT_FILE_SIZE, OPT_MYISAM_SORT_BUFFER_SIZE, OPT_MYISAM_USE_MMAP, OPT_MYISAM_REPAIR_THREADS, + OPT_MYISAM_MMAP_SIZE, OPT_MYISAM_STATS_METHOD, OPT_NET_BUFFER_LENGTH, OPT_NET_RETRY_COUNT, OPT_NET_READ_TIMEOUT, OPT_NET_WRITE_TIMEOUT, @@ -6847,6 +6848,10 @@ The minimum value for this variable is 4096.", (uchar**) &max_system_variables.myisam_max_sort_file_size, 0, GET_ULL, REQUIRED_ARG, (longlong) LONG_MAX, 0, (ulonglong) MAX_FILE_SIZE, 0, 1024*1024, 0}, + {"myisam_mmap_size", OPT_MYISAM_MMAP_SIZE, + "Can be used to restrict the total memory used for memory mmaping of myisam files", + (uchar**) &myisam_mmap_size, (uchar**) &myisam_mmap_size, 0, + GET_ULL, REQUIRED_ARG, SIZE_T_MAX, MEMMAP_EXTRA_MARGIN, SIZE_T_MAX, 0, 1, 0}, {"myisam_repair_threads", OPT_MYISAM_REPAIR_THREADS, "Number of threads to use when repairing MyISAM tables. The value of 1 disables parallel repair.", (uchar**) &global_system_variables.myisam_repair_threads, |