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

Leave the code in, but #ifdef it away to avoid compilation
error
This commit is contained in:
Sergei Petrunia 2016-10-09 17:03:31 +00:00
parent d3cd64fda9
commit f4994c7872
2 changed files with 4 additions and 0 deletions

View file

@ -7142,10 +7142,12 @@ bool ha_rocksdb::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)
{
m_force_skip_unique_check= skip;
}
#endif
bool ha_rocksdb::commit_in_the_middle()
{

View file

@ -459,7 +459,9 @@ class ha_rocksdb: public my_core::handler
bool can_use_single_delete(uint index)
__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;
#endif
bool commit_in_the_middle() __attribute__((__warn_unused_result__));
bool do_bulk_commit(Rdb_transaction *tx)
__attribute__((__nonnull__, __warn_unused_result__));