bzr push into mysql-6.0-codebase branch (satya.bn:3804 to 3805)

[Satya B]

 3805 Satya B	2009-12-24 [merge]
      merge mysql-5.1-bugteam to mysql-pe

    modified:
      storage/myisam/mi_static.c
 3804 Luis Soares	2009-12-24 [merge]
      BUG#48738: up-merging the null merge into mysql-pe.

=== modified file 'storage/myisam/mi_static.c'
--- a/storage/myisam/mi_static.c	2009-12-17 12:13:52 +0000
+++ b/storage/myisam/mi_static.c	2009-12-24 06:40:18 +0000
@@ -43,7 +43,6 @@ my_off_t myisam_max_temp_length= MAX_FIL
 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)))
 {


Attachment: [text/bzr-bundle] bzr/[e-mail]