diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-04-13 15:05:19 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-04-13 15:18:27 +1000 |
| commit | c63f197830a1b29d005f6609d5e5bfd373dbfde6 (patch) | |
| tree | 306e327c3f1a1dfdf0375b21d7a720085f6e94ba | |
| parent | 1ac87d6dd479ef83522edd13ce0fb280434ba8cd (diff) | |
| download | mariadb-git-bb-10.9-danielblack-MDEV-27791-test-postfix.tar.gz | |
MDEV-27791: rocksdb_log_dir test postfixbb-10.9-danielblack-MDEV-27791-test-postfix
We can only remove a subdirectory in mtr on an installed instance
Example failure previously:
CURRENT_TEST: rocksdb.rocksdb_log_dir
mysqltest: At line 15: Path '/usr/local/mariadb-10.9.0-linux-systemd-x86_64/mysql-test/var/tmp/1' is not a subdirectory of MYSQLTEST_VARDIR '/usr/local/mariadb-10.9.0-linux-systemd-x86_64/mysql-test/var/1'or MYSQL_TMP_DIR '/usr/local/mariadb-10.9.0-linux-systemd-x86_64/mysql-test/var/tmp/1'
3 files changed, 7 insertions, 3 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_log_dir.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_log_dir.result index 33f2e9f497c..dcb84d8f621 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_log_dir.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_log_dir.result @@ -1,3 +1,4 @@ +# restart CREATE DATABASE mysqltest; USE mysqltest; CREATE TABLE t1 (a INT PRIMARY KEY); diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.opt b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.opt index 8e5da2c042c..088d4036123 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.opt +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.opt @@ -1,2 +1,2 @@ ---plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb --rocksdb_log_dir=$MYSQL_TMP_DIR +--plugin-load=$HA_ROCKSDB_SO --default-storage-engine=rocksdb --rocksdb_log_dir=$MYSQL_TMP_DIR/logdir diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test index 4932011a38c..b842e58b887 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test @@ -1,5 +1,8 @@ --source include/have_rocksdb.inc +--mkdir $MYSQL_TMP_DIR/logdir +--source include/restart_mysqld.inc + CREATE DATABASE mysqltest; USE mysqltest; CREATE TABLE t1 (a INT PRIMARY KEY); @@ -9,7 +12,7 @@ DROP DATABASE mysqltest; --echo Check for MyRocks info LOG files --replace_regex /.*LOG/db_LOG/ ---list_files $MYSQL_TMP_DIR *LOG +--list_files $MYSQL_TMP_DIR/logdir *LOG # Clean up -remove_files_wildcard $MYSQL_TMP_DIR *LOG; +remove_files_wildcard $MYSQL_TMP_DIR/logdir *LOG; |