summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_static.c
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-12-17 17:15:13 +0530
committerSatya B <satya.bn@sun.com>2009-12-17 17:15:13 +0530
commitbbf079cf2cdee06b2a96cc520a10f33f28754ad3 (patch)
tree4c93c836980d7cf93eeacca6d20f05143aec86f5 /storage/myisam/mi_static.c
parent4621d480fc476127722e7a14656051edebb3673c (diff)
parentcf9966f86f3c6245f33342f2f5498a0c5efa96e4 (diff)
downloadmariadb-git-bbf079cf2cdee06b2a96cc520a10f33f28754ad3.tar.gz
merge mysql-5.0-bugteam to mysql-5.1-bugteam
Diffstat (limited to 'storage/myisam/mi_static.c')
-rw-r--r--storage/myisam/mi_static.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mi_static.c b/storage/myisam/mi_static.c
index a3ba785a94f..a43a099663b 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)))
{