@@ -155,10 +155,11 @@ Rdb_binlog_manager binlog_manager;
155
155
156
156
static Rdb_background_thread rdb_bg_thread;
157
157
158
-
158
+ # ifdef MARIAROCKS_NOT_YET
159
159
// List of table names (using regex) that are exceptions to the strict
160
160
// collation check requirement.
161
161
Regex_list_handler *rdb_collation_exceptions;
162
+ #endif
162
163
163
164
static const char * const ERRSTR_ROLLBACK_ONLY
164
165
= " This transaction was rolled back and cannot be "
@@ -3288,11 +3289,13 @@ static int rocksdb_init_func(void *p)
3288
3289
mysql_mutex_init (rdb_mem_cmp_space_mutex_key, &rdb_mem_cmp_space_mutex,
3289
3290
MY_MUTEX_INIT_FAST);
3290
3291
3292
+ #ifdef MARIAROCKS_NOT_YET
3291
3293
#if defined(HAVE_PSI_INTERFACE)
3292
3294
rdb_collation_exceptions = new Regex_list_handler (
3293
3295
key_rwlock_collation_exception_list);
3294
3296
#else
3295
3297
rdb_collation_exceptions = new Regex_list_handler ();
3298
+ #endif
3296
3299
#endif
3297
3300
3298
3301
mysql_mutex_init (rdb_sysvars_psi_mutex_key, &rdb_sysvars_mutex,
@@ -3672,7 +3675,9 @@ static int rocksdb_done_func(void *p)
3672
3675
mysql_mutex_destroy (&rdb_open_tables.m_mutex );
3673
3676
mysql_mutex_destroy (&rdb_sysvars_mutex);
3674
3677
3678
+ #ifdef MARIAROCKS_NOT_YET
3675
3679
delete rdb_collation_exceptions;
3680
+ #endif
3676
3681
mysql_mutex_destroy (&rdb_collation_data_mutex);
3677
3682
mysql_mutex_destroy (&rdb_mem_cmp_space_mutex);
3678
3683
@@ -4751,6 +4756,7 @@ void ha_rocksdb::set_skip_unique_check_tables(const char* whitelist)
4751
4756
{
4752
4757
DBUG_ASSERT (whitelist != nullptr );
4753
4758
4759
+ #ifdef MARIAROCKS_NOT_YET // regex_handler
4754
4760
#if defined(HAVE_PSI_INTERFACE)
4755
4761
Regex_list_handler regex_handler (key_rwlock_skip_unique_check_tables);
4756
4762
#else
@@ -4763,6 +4769,7 @@ void ha_rocksdb::set_skip_unique_check_tables(const char* whitelist)
4763
4769
}
4764
4770
4765
4771
m_skip_unique_check= regex_handler.matches (m_tbl_def->base_tablename ());
4772
+ #endif
4766
4773
}
4767
4774
4768
4775
int ha_rocksdb::open (const char *name, int mode, uint test_if_locked)
@@ -5055,7 +5062,11 @@ int ha_rocksdb::create_cfs(const TABLE *table_arg, Rdb_tbl_def *tbl_def_arg,
5055
5062
{
5056
5063
if (!rdb_is_index_collation_supported (
5057
5064
table_arg->key_info [i].key_part [part].field ) &&
5065
+ #ifdef MARIAROCKS_NOT_YET
5058
5066
!rdb_collation_exceptions->matches (tablename_sys))
5067
+ #else
5068
+ true )
5069
+ #endif
5059
5070
{
5060
5071
std::string collation_err;
5061
5072
for (auto coll : RDB_INDEX_COLLATIONS)
@@ -10602,13 +10613,15 @@ rocksdb_set_rate_limiter_bytes_per_sec(
10602
10613
10603
10614
void rdb_set_collation_exception_list (const char *exception_list)
10604
10615
{
10616
+ #ifdef MARIAROCKS_NOT_YET
10605
10617
DBUG_ASSERT (rdb_collation_exceptions != nullptr );
10606
10618
10607
10619
if (!rdb_collation_exceptions->set_patterns (exception_list))
10608
10620
{
10609
10621
my_core::warn_about_bad_patterns (rdb_collation_exceptions,
10610
10622
" strict_collation_exceptions" );
10611
10623
}
10624
+ #endif
10612
10625
}
10613
10626
10614
10627
void
0 commit comments