summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-12-24 12:04:31 +0530
committerSatya B <satya.bn@sun.com>2009-12-24 12:04:31 +0530
commit172acc598007f250c10c629ace64ff23ed665740 (patch)
treebaa020ec526dc18b5f38d8f8c2a6411b2c638ca2 /storage
parent9d5885e8c5351c7990b387b6b8f6ab1ec6c88e6f (diff)
parent1f55f5b617d0df650161c58f7d0707abd4ca42e2 (diff)
downloadmariadb-git-172acc598007f250c10c629ace64ff23ed665740.tar.gz
merge mysql-5.0-bugteam to mysql-5.1-bugteam
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/mi_static.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/myisam/mi_static.c b/storage/myisam/mi_static.c
index a43a099663b..27485e101ff 100644
--- a/storage/myisam/mi_static.c
+++ b/storage/myisam/mi_static.c
@@ -41,7 +41,6 @@ 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)))
{