Skip to content

Commit 4595a5e

Browse files
Merge pull request #14294 from mszeszko-meta/cherry_pick_14280_to_10_10
10.10.1 Patch Release
2 parents 3798025 + d4d93a1 commit 4595a5e

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,10 @@ if(MSVC)
219219
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
220220
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4996 /wd4100 /wd4324")
221221
endif()
222+
if(CMAKE_BUILD_TYPE STREQUAL "Release")
223+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DNDEBUG")
224+
message(STATUS "Setting /DNDEBUG as CMAKE_BUILD_TYPE is set to ${CMAKE_BUILD_TYPE}")
225+
endif()
222226
else()
223227
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall -pthread")
224228
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wshadow -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-invalid-offsetof")

‎HISTORY.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Rocksdb Change Log
22
> NOTE: Entries for next release do not go here. Follow instructions in `unreleased_history/README.txt`
33
4+
## 10.10.1 (02/02/2026)
5+
### Bug Fixes
6+
* Fix Windows VS 2022 build errors.
7+
48
## 10.10.0 (12/16/2025)
59
### Bug Fixes
610
* Fixed a bug in best-efforts recovery that causes use-after-free crashes when accessing SST files that were cached during the recovery.

‎include/rocksdb/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// minor or major version number planned for release.
1414
#define ROCKSDB_MAJOR 10
1515
#define ROCKSDB_MINOR 10
16-
#define ROCKSDB_PATCH 0
16+
#define ROCKSDB_PATCH 1
1717

1818
// Make it easy to do conditional compilation based on version checks, i.e.
1919
// #if ROCKSDB_VERSION_GE(4, 5, 6)

0 commit comments

Comments
 (0)