bk commit into 5.0 tree (jimw:1.1987) BUG#12582

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1987 05/08/17 18:08:30 jimw@stripped +1 -0
  Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582)

  include/my_global.h
    1.99 05/08/17 18:08:26 jimw@stripped +13 -4
    Add distinct set_timespec_nsec() macro for when HAVE_TIMESPEC_TS_SEC
    is defined.

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-12582

--- 1.98/include/my_global.h	2005-08-16 16:31:12 -07:00
+++ 1.99/include/my_global.h	2005-08-17 18:08:26 -07:00
@@ -927,7 +927,17 @@
 
 #ifndef set_timespec
 #ifdef HAVE_TIMESPEC_TS_SEC
-#define set_timespec(ABSTIME,SEC) { (ABSTIME).ts_sec=time(0) + (time_t) (SEC); (ABSTIME).ts_nsec=0; }
+#define set_timespec(ABSTIME,SEC) \
+{ \
+  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \
+  (ABSTIME).ts_nsec=0; \
+}
+#define set_timespec_nsec(ABSTIME,NSEC) \
+{\
+  ulonglong now= my_getsystime(); \
+  (ABSTIME).ts_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \
+  (ABSTIME).ts_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \
+}
 #else
 #define set_timespec(ABSTIME,SEC) \
 {\
@@ -936,15 +946,14 @@
   (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\
   (ABSTIME).tv_nsec=tv.tv_usec*1000;\
 }
-#endif /* HAVE_TIMESPEC_TS_SEC */
-#endif /* set_timespec */
-
 #define set_timespec_nsec(ABSTIME,NSEC) \
 {\
   ulonglong now= my_getsystime(); \
   (ABSTIME).tv_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \
   (ABSTIME).tv_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \
 }
+#endif /* HAVE_TIMESPEC_TS_SEC */
+#endif /* set_timespec */
 
 /*
   Define-funktions for reading and storing in machine independent format