diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-12-08 16:13:03 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-12-11 12:31:58 +0300 |
| commit | b8a0373ed2e4339d74aa7628f55dedf2303e57c6 (patch) | |
| tree | f23a8874542fff91ddb1bfacaea5fb5174267507 | |
| parent | 40eee1da17d529e35b554298e6bc400be8ed0e9c (diff) | |
| download | mariadb-git-b8a0373ed2e4339d74aa7628f55dedf2303e57c6.tar.gz | |
MDEV-14123: ".rocksdb folder may break workflow", and other MDEVs
Rename Use '#rocksdb' instead of '.rocksdb' as subdirectory for RocksDB
datadir.
6 files changed, 6 insertions, 6 deletions
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 5c7b185efdc..3613634f344 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -1446,7 +1446,7 @@ static MYSQL_SYSVAR_UINT( static MYSQL_SYSVAR_STR(datadir, rocksdb_datadir, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, "RocksDB data directory", nullptr, nullptr, - "./.rocksdb"); + "./#rocksdb"); static MYSQL_SYSVAR_STR(supported_compression_types, compression_types_val, diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.opt b/storage/rocksdb/mysql-test/rocksdb/suite.opt index f5dc0ce891c..3829658ab1c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/suite.opt +++ b/storage/rocksdb/mysql-test/rocksdb/suite.opt @@ -1,2 +1,2 @@ ---ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb +--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt index 431fc331458..b503913d2c8 100644 --- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt @@ -1,2 +1,2 @@ ---ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO +--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO diff --git a/storage/rocksdb/mysql-test/storage_engine/parts/suite.opt b/storage/rocksdb/mysql-test/storage_engine/parts/suite.opt index 1e464761753..d77a822766f 100644 --- a/storage/rocksdb/mysql-test/storage_engine/parts/suite.opt +++ b/storage/rocksdb/mysql-test/storage_engine/parts/suite.opt @@ -1 +1 @@ ---ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --loose-rocksdb_flush_log_at_trx_commit=0 +--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --loose-rocksdb_flush_log_at_trx_commit=0 diff --git a/storage/rocksdb/mysql-test/storage_engine/suite.opt b/storage/rocksdb/mysql-test/storage_engine/suite.opt index 8eb0e87db98..e6122c7ed3e 100644 --- a/storage/rocksdb/mysql-test/storage_engine/suite.opt +++ b/storage/rocksdb/mysql-test/storage_engine/suite.opt @@ -1 +1 @@ ---ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --collation-server=latin1_bin --loose-rocksdb_flush_log_at_trx_commit=0 +--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --collation-server=latin1_bin --loose-rocksdb_flush_log_at_trx_commit=0 diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/suite.opt b/storage/rocksdb/mysql-test/storage_engine/trx/suite.opt index 1e464761753..d77a822766f 100644 --- a/storage/rocksdb/mysql-test/storage_engine/trx/suite.opt +++ b/storage/rocksdb/mysql-test/storage_engine/trx/suite.opt @@ -1 +1 @@ ---ignore-db-dirs=.rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --loose-rocksdb_flush_log_at_trx_commit=0 +--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --loose-rocksdb_flush_log_at_trx_commit=0 |