List:Internals« Previous MessageNext Message »
From:sergeyv Date:October 17 2005 3:04pm
Subject:bk commit into 5.0 tree (SergeyV:1.2010)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of sergeyv. When sergeyv 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.2010 05/10/17 19:03:54 SergeyV@selena. +1 -0
  Small update for #13377 patch

  sql/log.cc
    1.175 05/10/17 19:03:42 SergeyV@selena. +1 -9
    Small update to apply patch to *nix builds as well

# 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:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#13377-mysql-5.0

--- 1.174/sql/log.cc	2005-10-03 20:34:17 +04:00
+++ 1.175/sql/log.cc	2005-10-17 19:03:42 +04:00
@@ -2322,15 +2322,10 @@
 void MYSQL_LOG::readers_addref()
 {
   /* 
-    currently readers_addref and readers_release are necessary  
-    only for __WIN__ build to wait untill readers will close
-    opened log files before reset.
-    There is no necessity for this on *nix, since it allows to
+    There is no necessity for reference counting on *nix, since it allows to
     delete opened files, however it is more clean way to wait
     untill all files will be closed on *nix as well.
-    If decided, the following #ifdef section is to be removed.
   */
-#ifdef __WIN__
   DBUG_ENTER("MYSQL_LOG::reader_addref");
   pthread_mutex_lock(&LOCK_log);
   pthread_mutex_lock(&LOCK_readers);
@@ -2338,12 +2333,10 @@
   pthread_mutex_unlock(&LOCK_readers);
   pthread_mutex_unlock(&LOCK_log);
   DBUG_VOID_RETURN;
-#endif
 }
 
 void MYSQL_LOG::readers_release()
 {
-#ifdef __WIN__
   DBUG_ENTER("MYSQL_LOG::reader_release");
   pthread_mutex_lock(&LOCK_log);
   readers_count--;
@@ -2351,7 +2344,6 @@
     pthread_cond_broadcast(&reset_cond);
   pthread_mutex_unlock(&LOCK_log);
   DBUG_VOID_RETURN;
-#endif
 }
 
 #ifdef __NT__
Thread
bk commit into 5.0 tree (SergeyV:1.2010)sergeyv17 Oct