Skip to content

Commit

Permalink
MDEV-13852 - redefine WinWriteableFile such as IsSyncThreadSafe()
Browse files Browse the repository at this point in the history
is set to true, as it should.

Copy and modify original io_win.h header file to a different location
(as we cannot patch anything in submodule). Make sure modified header is
used.
  • Loading branch information
vaintroub committed Nov 16, 2017
1 parent 842dce3 commit 689168b
Show file tree
Hide file tree
Showing 3 changed files with 451 additions and 1 deletion.
5 changes: 5 additions & 0 deletions storage/rocksdb/build_rocksdb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ INCLUDE_DIRECTORIES(
${ROCKSDB_SOURCE_DIR}/third-party/gtest-1.7.0/fused-src
)

IF(WIN32)
INCLUDE_DIRECTORIES(BEFORE
${CMAKE_CURRENT_SOURCE_DIR}/patch)
ENDIF()

list(APPEND CMAKE_MODULE_PATH "${ROCKSDB_SOURCE_DIR}/cmake/modules/")

if(WIN32)
Expand Down
1 change: 0 additions & 1 deletion storage/rocksdb/mysql-test/rocksdb/suite.pm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ $ENV{MARIAROCKS_SST_DUMP}="$sst_dump";
# Temporarily disable testing under valgrind, due to MDEV-12439
return "RocksDB tests disabled under valgrind" if ($::opt_valgrind);

return "Temporarily disabled on Windows due to MDEV-13852" if (My::SysInfo::IS_WINDOWS);

bless { };

Loading

0 comments on commit 689168b

Please sign in to comment.