[Commits] 46a7886: MariaRocks: make rocksdb.rocksdb_datadir test pass

Sergei Petrunia psergey at askmonty.org
Thu Mar 16 23:05:48 EET 2017


revision-id: 46a78868fead5dadf68758d21e20e9c89c23d89d
parent(s): 23f9bb966b96b8555328b9e913724f435cb08182
committer: Sergei Petrunia
branch nick: 10.2-mariarocks
timestamp: 2017-03-17 00:05:48 +0300
message:

MariaRocks: make rocksdb.rocksdb_datadir test pass

The test runs $MYSQLD_BOOTSTRAP_CMD but that command does not include
arguments for loading ha_rocksdb.so plugin. Add them.

---
 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_datadir.test | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_datadir.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_datadir.test
index ba10dcb..18dff31 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_datadir.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_datadir.test
@@ -19,8 +19,9 @@ EOF
 # Must ensure this directory exists before launching mysqld
 mkdir $ddir;
 
+let $plugin_dir=`select @@plugin_dir`;
 # Launch mysqld with non-standard rocksdb_datadir
-exec $MYSQLD_BOOTSTRAP_CMD --datadir=$ddir --rocksdb_datadir=$rdb_ddir --default-storage-engine=rocksdb --skip-innodb --default-tmp-storage-engine=MyISAM --rocksdb < $sql_file;
+exec $MYSQLD_BOOTSTRAP_CMD --plugin-dir=$plugin_dir --plugin-load=$HA_ROCKSDB_SO --datadir=$ddir --rocksdb_datadir=$rdb_ddir --default-storage-engine=rocksdb --skip-innodb --default-tmp-storage-engine=MyISAM --rocksdb < $sql_file;
 
 --echo Check for the number of MANIFEST files
 exec ls $rdb_ddir/MANIFEST-0000* | wc -l;


More information about the commits mailing list