diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
| commit | 0e3a80e0a851822112226e5e792320389aa0f2ae (patch) | |
| tree | ff7694d43f6a555d626904a5e76d66755c22f43d /storage/myisam/mi_static.c | |
| parent | cc85fe239dd14088b2f326f263765612b03e8f61 (diff) | |
| parent | 53da51de9d8fc607063e131cc32361f39d95ac2d (diff) | |
| download | mariadb-git-0e3a80e0a851822112226e5e792320389aa0f2ae.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- storage/myisam/mi_packrec.c
Diffstat (limited to 'storage/myisam/mi_static.c')
| -rw-r--r-- | storage/myisam/mi_static.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mi_static.c b/storage/myisam/mi_static.c index aaa7405bbb5..b763308a4a9 100644 --- a/storage/myisam/mi_static.c +++ b/storage/myisam/mi_static.c @@ -40,7 +40,8 @@ ulong myisam_concurrent_insert= 0; my_off_t myisam_max_temp_length= MAX_FILE_SIZE; ulong myisam_bulk_insert_tree_size=8192*1024; ulong myisam_data_pointer_size=4; - +ulonglong myisam_mmap_size= SIZE_T_MAX, myisam_mmap_used= 0; +pthread_mutex_t THR_LOCK_myisam_mmap; static int always_valid(const char *filename __attribute__((unused))) { |