bk commit into 5.1 tree (istruewing:1.2432) BUG#25460

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-22 09:12:07+01:00, istruewing@stripped +1 -0
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Decreased code duplication by calling memory mapping
  function through mi_extra().

  storage/myisam/mi_open.c@stripped, 2007-02-22 09:12:03+01:00, istruewing@stripped +8 -16
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Decreased code duplication by calling memory mapping
    function through mi_extra().

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-bug25460

--- 1.116/storage/myisam/mi_open.c	2007-02-22 09:12:14 +01:00
+++ 1.117/storage/myisam/mi_open.c	2007-02-22 09:12:14 +01:00
@@ -506,22 +506,6 @@ MI_INFO *mi_open(const char *name, int m
       share->data_file_type = DYNAMIC_RECORD;
     my_afree((gptr) disk_cache);
     mi_setup_functions(share);
-    if (open_flags & HA_OPEN_MMAP)
-    {
-      info.s= share;
-      if (mi_dynmap_file(&info, share->state.state.data_file_length))
-      {
-        /* purecov: begin inspected */
-        /* Ignore if mmap fails. Use file I/O instead. */
-        DBUG_PRINT("warning", ("mmap failed: errno: %d", errno));
-        /* purecov: end */
-      }
-      else
-      {
-        share->file_read= mi_mmap_pread;
-        share->file_write= mi_mmap_pwrite;
-      }
-    }
     share->is_log_table= FALSE;
 #ifdef THREAD
     thr_lock_init(&share->lock);
@@ -552,6 +536,14 @@ MI_INFO *mi_open(const char *name, int m
       }
     }
 #endif
+    /*
+      Memory mapping can only be requested after initializing intern_lock.
+    */
+    if (open_flags & HA_OPEN_MMAP)
+    {
+      info.s= share;
+      mi_extra(&info, HA_EXTRA_MMAP, 0);
+    }
   }
   else
   {