Skip to content

M
mariadb
Commit fac1a811 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

merge

parents dcce4286 d202a221
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
storage/maria/ma_bitmap.c
View file @ fac1a811
...@@ -284,7 +284,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file, ...@@ -284,7 +284,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file,
*/ */
{ {
pgcache_page_no_t last_bitmap_page; 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; last_bitmap_page= *last_page - *last_page % bitmap->pages_covered;
blocks= *last_page - last_bitmap_page; blocks= *last_page - last_bitmap_page;
......
win/cmake/install_macros.cmake
View file @ fac1a811
...@@ -152,7 +152,8 @@ IF(WIN32) ...@@ -152,7 +152,8 @@ IF(WIN32)
/a /t http://timestamp.verisign.com/scripts/timstamp.dll /a /t http://timestamp.verisign.com/scripts/timstamp.dll
CACHE STRING "parameters for signtool (list)") CACHE STRING "parameters for signtool (list)")
FIND_PROGRAM(SIGNTOOL_EXECUTABLE signtool 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) IF(NOT SIGNTOOL_EXECUTABLE)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7