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
085fa3e4
Commit
085fa3e4
authored
Oct 19, 2016
by
Sergei Petrunia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MariaRocks port: rli_slave is called rgi_slave in MariaDB.
parent
e951fd17
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/ha_rocksdb.cc
+3
-3
No files found.
storage/rocksdb/ha_rocksdb.cc
View file @
085fa3e4
...
...
@@ -2453,7 +2453,7 @@ static Rdb_transaction *get_or_create_tx(THD *thd)
// TODO: this is called too many times.. O(#rows)
if
(
tx
==
nullptr
)
{
if
(
rpl_skip_tx_api_var
&&
thd
->
r
l
i_slave
)
if
(
rpl_skip_tx_api_var
&&
thd
->
r
g
i_slave
)
tx
=
new
Rdb_writebatch_impl
(
thd
);
else
tx
=
new
Rdb_transaction_impl
(
thd
);
...
...
@@ -2531,7 +2531,7 @@ static std::string rdb_xid_to_string(const XID& src)
static
bool
rocksdb_flush_wal
(
handlerton
*
hton
__attribute__
((
__unused__
)))
#ifdef MARIAROCKS_NOT_YET
ulonglong
target_lsn
__attribute__
((
__unused__
)))
#e
lse
#e
ndif
{
DBUG_ASSERT
(
rdb
!=
nullptr
);
rocksdb
::
Status
s
=
rdb
->
SyncWAL
();
...
...
@@ -8675,7 +8675,7 @@ int ha_rocksdb::external_lock(THD *thd, int lock_type)
int
binlog_format
=
my_core
::
thd_binlog_format
(
thd
);
bool
unsafe_for_binlog
=
THDVAR
(
ha_thd
(),
unsafe_for_binlog
);
if
(
lock_type
==
F_WRLCK
&&
!
thd
->
r
l
i_slave
&&
if
(
lock_type
==
F_WRLCK
&&
!
thd
->
r
g
i_slave
&&
!
unsafe_for_binlog
&&
binlog_format
!=
BINLOG_FORMAT_ROW
&&
binlog_format
!=
BINLOG_FORMAT_UNSPEC
&&
...
...
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