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
6fb59d52
Commit
6fb59d52
authored
Mar 21, 2020
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-742: Fix clang -Winconsistent-missing-override
parent
2559075b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/ha_rocksdb.cc
+2
-2
No files found.
storage/rocksdb/ha_rocksdb.cc
View file @
6fb59d52
...
@@ -3159,11 +3159,11 @@ class Rdb_transaction_impl : public Rdb_transaction {
...
@@ -3159,11 +3159,11 @@ class Rdb_transaction_impl : public Rdb_transaction {
virtual
bool
is_writebatch_trx
()
const
override
{
return
false
;
}
virtual
bool
is_writebatch_trx
()
const
override
{
return
false
;
}
bool
is_prepared
()
{
bool
is_prepared
()
override
{
return
m_rocksdb_tx
&&
rocksdb
::
Transaction
::
PREPARED
==
m_rocksdb_tx
->
GetState
();
return
m_rocksdb_tx
&&
rocksdb
::
Transaction
::
PREPARED
==
m_rocksdb_tx
->
GetState
();
}
}
void
detach_prepared_tx
()
{
void
detach_prepared_tx
()
override
{
DBUG_ASSERT
(
rocksdb
::
Transaction
::
PREPARED
==
m_rocksdb_tx
->
GetState
());
DBUG_ASSERT
(
rocksdb
::
Transaction
::
PREPARED
==
m_rocksdb_tx
->
GetState
());
m_rocksdb_tx
=
nullptr
;
m_rocksdb_tx
=
nullptr
;
}
}
...
...
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