bk commit into 5.1 tree (Kristofer.Pettersson:1.2317)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of Kristofer Pettersson. When Kristofer Pettersson 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, 2006-09-17 14:06:29+02:00, Kristofer.Pettersson@naruto. +1 -0
  Merge naruto.:C:/cpp/bug20789/my50-bug20789
  into  naruto.:C:/cpp/mysql-5.1-new-maint
  MERGE: 1.1810.2067.2

  storage/myisam/mi_locking.c@stripped, 2006-09-17 14:06:08+02:00,
Kristofer.Pettersson@naruto. +0 -0
    Auto merged
    MERGE: 1.38.3.2

  storage/myisam/mi_locking.c@stripped, 2006-09-17 14:06:08+02:00,
Kristofer.Pettersson@naruto. +0 -0
    Merge rename: myisam/mi_locking.c -> storage/myisam/mi_locking.c

# 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:	Kristofer.Pettersson
# Host:	naruto.
# Root:	C:/cpp/mysql-5.1-new-maint/RESYNC

--- 1.38.3.1/myisam/mi_locking.c	2006-09-17 14:07:11 +02:00
+++ 1.47/storage/myisam/mi_locking.c	2006-09-17 14:07:11 +02:00
@@ -21,7 +21,7 @@
   isamdatabase.
 */
 
-#include "myisamdef.h"
+#include "ftdefs.h"
 
 	/* lock table by F_UNLCK, F_RDLCK or F_WRLCK */
 
@@ -38,7 +38,6 @@
                       share->w_locks,
                       share->global_changed, share->state.open_count,
                       share->index_file_name));
-
   if (share->options & HA_OPTION_READ_ONLY_DATA ||
       info->lock_type == lock_type)
     DBUG_RETURN(0);
@@ -56,6 +55,7 @@
   {
     switch (lock_type) {
     case F_UNLCK:
+      ftparser_call_deinitializer(info);
       if (info->lock_type == F_RDLCK)
 	count= --share->r_locks;
       else
@@ -84,6 +84,18 @@
 			   (uint) share->changed, share->w_locks));
 	if (share->changed && !share->w_locks)
 	{
+#ifdef HAVE_MMAP
+    if ((info->s->mmaped_length != info->s->state.state.data_file_length)
&&
+        (info->s->nonmmaped_inserts > MAX_NONMAPPED_INSERTS))
+    {
+      if (info->s->concurrent_insert)
+        rw_wrlock(&info->s->mmap_lock);
+      mi_remap_file(info, info->s->state.state.data_file_length);
+      info->s->nonmmaped_inserts= 0;
+      if (info->s->concurrent_insert)
+        rw_unlock(&info->s->mmap_lock);
+    }
+#endif
 	  share->state.process= share->last_process=share->this_process;
 	  share->state.unique=   info->last_unique=  info->this_unique;
 	  share->state.update_count= info->last_loop= ++info->this_loop;
@@ -215,6 +227,7 @@
 	}
       }
       VOID(_mi_test_if_changed(info));
+        
       info->lock_type=lock_type;
       info->invalidator=info->s->invalidator;
       share->w_locks++;