List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:January 9 2006 3:37pm
Subject:bk commit into 5.1 tree (mats:1.2029)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl 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.2029 06/01/09 16:37:24 mats@stripped +2 -0
  Changes to support HP-UX.

  sql/log_event.h
    1.125 06/01/09 16:37:14 mats@stripped +1 -1
    Preprocessor symbol NO_FLAGS used by system on HP-UX.

  sql/log.cc
    1.182 06/01/09 16:37:13 mats@stripped +1 -1
    Preprocessor symbol NO_FLAGS used by system on HP-UX.

# 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:	mats
# Host:	dl145k.mysql.com
# Root:	/users/mkindahl/bk/fix-mysql-5.1-new

--- 1.181/sql/log.cc	2005-12-24 12:06:57 +01:00
+++ 1.182/sql/log.cc	2006-01-09 16:37:13 +01:00
@@ -2560,7 +2560,7 @@
 #endif
 
   Table_map_log_event::flag_set const
-    flags= Table_map_log_event::NO_FLAGS;
+    flags= Table_map_log_event::TM_NO_FLAGS;
 
   Table_map_log_event
     the_event(thd, table, table->s->table_map_id, is_transactional, flags);

--- 1.124/sql/log_event.h	2006-01-09 15:59:30 +01:00
+++ 1.125/sql/log_event.h	2006-01-09 16:37:14 +01:00
@@ -1685,7 +1685,7 @@
   /* Special constants representing sets of flags */
   enum 
   {
-    NO_FLAGS = 0U
+    TM_NO_FLAGS = 0U
   };
 
   void set_flags(flag_set flag) { m_flags |= flag; }
Thread
bk commit into 5.1 tree (mats:1.2029)Mats Kindahl9 Jan