Commit f4994c78 authored by Sergei Petrunia's avatar Sergei Petrunia

MDEV-10975: Merging of @@rocksdb_skip_unique_check: Part #1

Leave the code in, but #ifdef it away to avoid compilation
error
parent d3cd64fd
...@@ -7142,10 +7142,12 @@ bool ha_rocksdb::skip_unique_check() ...@@ -7142,10 +7142,12 @@ bool ha_rocksdb::skip_unique_check()
THDVAR(table->in_use, skip_unique_check); THDVAR(table->in_use, skip_unique_check);
} }
#ifdef MARIAROCKS_NOT_YET // MDEV-10975
void ha_rocksdb::set_force_skip_unique_check(bool skip) void ha_rocksdb::set_force_skip_unique_check(bool skip)
{ {
m_force_skip_unique_check= skip; m_force_skip_unique_check= skip;
} }
#endif
bool ha_rocksdb::commit_in_the_middle() bool ha_rocksdb::commit_in_the_middle()
{ {
......
...@@ -459,7 +459,9 @@ class ha_rocksdb: public my_core::handler ...@@ -459,7 +459,9 @@ class ha_rocksdb: public my_core::handler
bool can_use_single_delete(uint index) bool can_use_single_delete(uint index)
__attribute__((__warn_unused_result__)); __attribute__((__warn_unused_result__));
bool skip_unique_check() __attribute__((__warn_unused_result__)); bool skip_unique_check() __attribute__((__warn_unused_result__));
#ifdef MARIAROCKS_NOT_YET // MDEV-10975
void set_force_skip_unique_check(bool skip) override; void set_force_skip_unique_check(bool skip) override;
#endif
bool commit_in_the_middle() __attribute__((__warn_unused_result__)); bool commit_in_the_middle() __attribute__((__warn_unused_result__));
bool do_bulk_commit(Rdb_transaction *tx) bool do_bulk_commit(Rdb_transaction *tx)
__attribute__((__nonnull__, __warn_unused_result__)); __attribute__((__nonnull__, __warn_unused_result__));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment