List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 16 2006 8:31am
Subject:bk commit into 5.1 tree (pkarthick:1.2064)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of prem. When prem 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
  1.2064 06/01/16 14:01:22 pkarthick@stripped +1 -0
  Enclosed MMAP related code under, HAVE_MMAP preprocessor directive.

  storage/myisam/mi_locking.c
    1.43 06/01/16 14:01:16 pkarthick@stripped +10 -8
    Enclosed MMAP related code under, HAVE_MMAP preprocessor directive.

# 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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-5.1

--- 1.42/storage/myisam/mi_locking.c	2005-12-28 17:35:20 +05:30
+++ 1.43/storage/myisam/mi_locking.c	2006-01-16 14:01:16 +05:30
@@ -84,14 +84,16 @@
 			   (uint) share->changed, share->w_locks));
 	if (share->changed && !share->w_locks)
 	{
-          if (info->s->mmaped_length != info->s->state.state.data_file_length)
-          {
-            if (info->s->concurrent_insert)
-              rw_wrlock(&info->s->mmap_lock);
-            mi_remap_file(info, info->s->state.state.data_file_length);
-            if (info->s->concurrent_insert)
-              rw_unlock(&info->s->mmap_lock);
-          }
+#ifdef HAVE_MMAP
+    if (info->s->mmaped_length != info->s->state.state.data_file_length)
+    {
+      if (info->s->concurrent_insert)
+        rw_wrlock(&info->s->mmap_lock);
+      mi_remap_file(info, info->s->state.state.data_file_length);
+      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;
Thread
bk commit into 5.1 tree (pkarthick:1.2064)pkarthick16 Jan