bk commit into 5.1 tree (reggie:1.1907)

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of reggie. When reggie 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.1907 05/08/29 15:41:43 reggie@stripped +3 -0
  Few fixes to get 5.1 to compile on Windows

  sql/sql_class.cc
    1.202 05/08/29 15:41:25 reggie@stripped +1 -1
    changed cast from byte* to gptr to match decl of my_free

  sql/key.cc
    1.37 05/08/29 15:41:25 reggie@stripped +2 -1
    cat rec0 to byte* so that the types match.  VC++ 7.1 complains
    about subtracting different types

  include/my_global.h
    1.102 05/08/29 15:41:25 reggie@stripped +12 -7
    move the defines for set_timespec_nsec out of the 
    #ifndef set_timespec block because set_timespec is defined in
    config_win.h however we still need the definition of
    set_timespec_nsec o nWindows.

# 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:	reggie
# Host:	linux.site
# Root:	/home/reggie/bk/mysql-5.1

--- 1.36/sql/key.cc	2005-07-22 15:05:12 -06:00
+++ 1.37/sql/key.cc	2005-08-29 15:41:25 -06:00
@@ -461,7 +461,8 @@
   uint key_parts= key_info->key_parts, i= 0;
   KEY_PART_INFO *key_part= key_info->key_part;
   char *rec0= key_part->field->ptr - key_part->offset;
-  my_ptrdiff_t first_diff= first_rec - rec0, sec_diff= second_rec - rec0;
+  my_ptrdiff_t first_diff= first_rec - (byte*)rec0;
+  my_ptrdiff_t sec_diff= second_rec - (byte*)rec0;
   int result= 0;
   DBUG_ENTER("key_rec_cmp");
 

--- 1.201/sql/sql_class.cc	2005-08-15 09:35:44 -06:00
+++ 1.202/sql/sql_class.cc	2005-08-29 15:41:25 -06:00
@@ -1945,7 +1945,7 @@
 static void xid_free_hash (void *ptr)
 {
   if (!((XID_STATE*)ptr)->in_thd)
-    my_free((byte *)ptr, MYF(0));
+    my_free((gptr)ptr, MYF(0));
 }
 
 bool xid_cache_init()

--- 1.101/include/my_global.h	2005-08-25 10:49:38 -06:00
+++ 1.102/include/my_global.h	2005-08-29 15:41:25 -06:00
@@ -1020,12 +1020,6 @@
   (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \
   (ABSTIME).ts_nsec=0; \
 }
-#define set_timespec_nsec(ABSTIME,NSEC) \
-{ \
-  ulonglong now= my_getsystime() + (NSEC/100); \
-  (ABSTIME).ts_sec=  (now / ULL(10000000)); \
-  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
-}
 #else
 #define set_timespec(ABSTIME,SEC) \
 {\
@@ -1034,6 +1028,17 @@
   (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\
   (ABSTIME).tv_nsec=tv.tv_usec*1000;\
 }
+#endif /* HAVE_TIMESPEC_TS_SEC */
+#endif /* set_timespec */
+
+#ifdef HAVE_TIMESPEC_TS_SEC
+#define set_timespec_nsec(ABSTIME,NSEC) \
+{ \
+  ulonglong now= my_getsystime() + (NSEC/100); \
+  (ABSTIME).ts_sec=  (now / ULL(10000000)); \
+  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
+}
+#else
 #define set_timespec_nsec(ABSTIME,NSEC) \
 {\
   ulonglong now= my_getsystime() + (NSEC/100); \
@@ -1041,7 +1046,7 @@
   (ABSTIME).tv_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100));    \
 }
 #endif /* HAVE_TIMESPEC_TS_SEC */
-#endif /* set_timespec */
+
 
 /*
   Define-funktions for reading and storing in machine independent format