List:Commits« Previous MessageNext Message »
From:knielsen Date:December 22 2005 8:53pm
Subject:bk commit into 5.1 tree (knielsen:1.1986)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.1986 05/12/22 21:53:29 knielsen@stripped +2 -0
  Compile fixes for aix52-64bit.

  sql/rpl_tblmap.h
    1.2 05/12/22 21:52:42 knielsen@stripped +0 -4
    Remove unused NO_TABLE enum which broke compilation on picky compilers (trying to put ULONG_MAX into an int...)

  include/my_bitmap.h
    1.21 05/12/22 21:51:18 knielsen@stripped +2 -0
    Protect incluce of my_pthread.h with #ifdef THREAD, to make it work in non-thread environment.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new

--- 1.20/include/my_bitmap.h	2005-11-24 05:15:31 +01:00
+++ 1.21/include/my_bitmap.h	2005-12-22 21:51:18 +01:00
@@ -17,7 +17,9 @@
 #ifndef _my_bitmap_h_
 #define _my_bitmap_h_
 
+#ifdef THREAD
 #include <my_pthread.h>
+#endif
 
 #define MY_BIT_NONE (~(uint) 0)
 

--- 1.1/sql/rpl_tblmap.h	2005-12-22 06:34:48 +01:00
+++ 1.2/sql/rpl_tblmap.h	2005-12-22 21:52:42 +01:00
@@ -54,10 +54,6 @@
 
 public:
 
-  enum {
-    NO_TABLE = ULONG_MAX
-  };
-
   enum enum_error {
       ERR_NO_ERROR = 0,
       ERR_LIMIT_EXCEEDED,
Thread
bk commit into 5.1 tree (knielsen:1.1986)knielsen22 Dec