merge

storage/maria/ma_bitmap.c

@@ -284,7 +284,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file,
   */
   {
     pgcache_page_no_t last_bitmap_page;
-    ulong blocks, bytes;
+    pgcache_page_no_t blocks, bytes;
 
     last_bitmap_page= *last_page - *last_page % bitmap->pages_covered;
     blocks= *last_page - last_bitmap_page;

win/cmake/install_macros.cmake

@@ -152,7 +152,8 @@ IF(WIN32)
      /a /t http://timestamp.verisign.com/scripts/timstamp.dll
      CACHE STRING "parameters for signtool (list)")
     FIND_PROGRAM(SIGNTOOL_EXECUTABLE signtool 
-      PATHS "$ENV{ProgramFiles}/Microsoft SDKs/Windows/v7.0A"
+      PATHS "$ENV{ProgramFiles}/Microsoft SDKs/Windows/v7.0A/bin"
+	  "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86"
     )
     IF(NOT SIGNTOOL_EXECUTABLE)
       MESSAGE(FATAL_ERROR