bzr commit into mysql-5.1 branch (stewart:2854)

[Stewart Smith]

#At file:///home/stewart/mysql/win-ndbwin32/

 2854 Stewart Smith	2008-09-21
      post merge ndbwin32 fixes
modified:
  include/config-win.h
  storage/ndb/src/common/portlib/win32/NdbTick.c

per-file messages:
  include/config-win.h
    fix vsnprintf warning on win32
  storage/ndb/src/common/portlib/win32/NdbTick.c
    add NdbTick_Init() null implementation for win32
=== modified file 'include/config-win.h'
--- a/include/config-win.h	2008-09-21 05:47:04 +0000
+++ b/include/config-win.h	2008-09-21 15:53:13 +0000
@@ -316,8 +316,10 @@ inline double ulonglong2double(ulonglong
 #endif
 
 #if _MSC_VER >= 1500   /* VS9 (2008) has vsnprintf */
+#ifndef HAVE_VSNPRINTF
 #define HAVE_VSNPRINTF
 #endif
+#endif
 #ifndef HAVE_STRTOUL
 #define HAVE_STRTOUL
 #endif

=== modified file 'storage/ndb/src/common/portlib/win32/NdbTick.c'
--- a/storage/ndb/src/common/portlib/win32/NdbTick.c	2008-08-21 05:07:54 +0000
+++ b/storage/ndb/src/common/portlib/win32/NdbTick.c	2008-09-21 15:53:13 +0000
@@ -16,6 +16,11 @@
 #include <ndb_global.h>
 #include "NdbTick.h"
 
+void NdbTick_Init()
+{
+  return;
+}
+
 NDB_TICKS NdbTick_CurrentMillisecond(void)
 {
   NDB_TICKS sec;Uint32 usec;