List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 25 2006 5:47am
Subject:bk commit into 5.1 tree (pkarthick:1.2082)
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.2082 06/01/25 11:17:10 pkarthick@stripped[prem] +2 -0
  5.1_macros.patch

  storage/myisam/mi_locking.c
    1.43 06/01/16 14:02:18 pkarthick@stripped[prem] +10 -8
    Import patch 5.1_macros.patch

  sql/sql_class.cc
    1.242 06/01/18 15:14:19 pkarthick@stripped[prem] +2 -0
    Import patch 5.1_macros.patch

# 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:02:18 +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;

--- 1.241/sql/sql_class.cc	2006-01-24 18:03:58 +05:30
+++ 1.242/sql/sql_class.cc	2006-01-18 15:14:19 +05:30
@@ -2264,6 +2264,7 @@
   return pending;              /* This is the current pending event */
 }
 
+#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
 /*
   Instansiate the versions we need, we have -fno-implicit-template as
   compiling option.
@@ -2282,6 +2283,7 @@
 THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
 				       my_size_t colcnt, my_size_t, bool,
 				       Update_rows_log_event *);
+#endif
 static char const* 
 field_type_name(enum_field_types type) 
 {
Thread
bk commit into 5.1 tree (pkarthick:1.2082)pkarthick25 Jan