Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a55309d9
Commit
a55309d9
authored
6 years ago
by
Sergei Petrunia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MyRocks: post-merge fixes: Make it compile on Windows.
parent
2770eb1b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
storage/rocksdb/CMakeLists.txt
storage/rocksdb/CMakeLists.txt
+9
-0
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/ha_rocksdb.cc
+2
-3
storage/rocksdb/rdb_i_s.cc
storage/rocksdb/rdb_i_s.cc
+1
-1
No files found.
storage/rocksdb/CMakeLists.txt
View file @
a55309d9
...
...
@@ -43,6 +43,15 @@ IF (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
SKIP_ROCKSDB_PLUGIN
(
"32-Bit Windows are temporarily disabled"
)
ENDIF
()
#
# RocksDB's port/win/env_win.cc uses parts of Windows API that are not part
# of the LEAN_AND_MEAN set. Ideally we should undef LEAN_AND_MEAN only for
# that file, but REMOVE_DEFINITIONS only works per-directory?
#
IF
(
WIN32
)
REMOVE_DEFINITIONS
(
-DWIN32_LEAN_AND_MEAN
)
ENDIF
()
# This plugin needs recent C++ compilers (it is using C++11 features)
# Skip build for the old compilers
SET
(
CXX11_FLAGS
)
...
...
This diff is collapsed.
Click to expand it.
storage/rocksdb/ha_rocksdb.cc
View file @
a55309d9
...
...
@@ -553,7 +553,7 @@ static char* rocksdb_git_hash;
char
*
compression_types_val
=
const_cast
<
char
*>
(
get_rocksdb_supported_compression_types
());
static
u
int64_t
rocksdb_write_policy
=
static
u
nsigned
long
rocksdb_write_policy
=
rocksdb
::
TxnDBWritePolicy
::
WRITE_COMMITTED
;
static
my_bool
rocksdb_error_on_suboptimal_collation
=
1
;
static
uint32_t
rocksdb_stats_recalc_rate
=
0
;
...
...
@@ -13297,8 +13297,7 @@ void Rdb_manual_compaction_thread::run() {
break
;
}
timespec
ts
;
clock_gettime
(
CLOCK_REALTIME
,
&
ts
);
ts
.
tv_sec
+=
1
;
set_timespec
(
ts
,
1
);
const
auto
ret
MY_ATTRIBUTE
((
__unused__
))
=
mysql_cond_timedwait
(
&
m_signal_cond
,
&
m_signal_mutex
,
&
ts
);
...
...
This diff is collapsed.
Click to expand it.
storage/rocksdb/rdb_i_s.cc
View file @
a55309d9
...
...
@@ -1909,7 +1909,7 @@ struct st_maria_plugin rdb_i_s_ddl = {
MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
};
struct
st_m
ysql
_plugin
rdb_i_s_sst_props
=
{
struct
st_m
aria
_plugin
rdb_i_s_sst_props
=
{
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
&
rdb_i_s_info
,
"ROCKSDB_SST_PROPS"
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment