diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-09-16 18:26:20 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-09-16 18:26:20 +0200 |
| commit | 999c37bb0faa64a3c01b6ea0c71b44eb334735a1 (patch) | |
| tree | 423c4f838ed453cacedfa31d5b8274ce8259ef6b | |
| parent | 574e51e5fd53649fb560237eb89a8ff65ac45e22 (diff) | |
| parent | d202a22132bf63f10f770e97399cefeffee9a388 (diff) | |
| download | mariadb-git-999c37bb0faa64a3c01b6ea0c71b44eb334735a1.tar.gz | |
merge
| -rw-r--r-- | storage/maria/ma_bitmap.c | 2 | ||||
| -rw-r--r-- | win/cmake/install_macros.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c index a98ef71604d..39c3cd27d33 100644 --- a/storage/maria/ma_bitmap.c +++ b/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; diff --git a/win/cmake/install_macros.cmake b/win/cmake/install_macros.cmake index e74d064b9a5..a5357204950 100644 --- a/win/cmake/install_macros.cmake +++ b/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 |