Manual merge from mysql-trunk.

Conflicts: - storage/myisam/mi_static.c

Manual merge from mysql-trunk.
Conflicts: - storage/myisam/mi_static.c
9f335d9e · Alexander Nozdrin · 88642ae7 · 9721437e · 9f335d9e
Commit 9f335d9e authored Dec 24, 2009 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

storage/myisam/mi_static.c storage/myisam/mi_static.c +0 -1

No files found.
--- 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;
-mysql_mutex_t  THR_LOCK_myisam_mmap;

 static int always_valid(const char *filename __attribute__((unused)))
 {