[Commits] 261d475: Post-merge fixes: rocksdb.check_ignore_unknown_options

Sergei Petrunia psergey at askmonty.org
Sun Apr 15 14:34:56 EEST 2018


revision-id: 261d4755f4418d3a1b4dadf8d1ed5098ae3aa92f
parent(s): 8496e84f05e69a31e93653468b6e0579e154e8d8
committer: Sergei Petrunia
branch nick: 10.2-r10
timestamp: 2018-04-15 14:34:56 +0300
message:

Post-merge fixes: rocksdb.check_ignore_unknown_options

---
 .../mysql-test/rocksdb/r/check_ignore_unknown_options.result       | 1 +
 .../rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/check_ignore_unknown_options.result b/storage/rocksdb/mysql-test/rocksdb/r/check_ignore_unknown_options.result
index 24c1b73..6ff4990 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/check_ignore_unknown_options.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/check_ignore_unknown_options.result
@@ -1,6 +1,7 @@
 select variable_name, variable_value from information_schema.global_variables where variable_name="rocksdb_ignore_unknown_options";
 variable_name	variable_value
 ROCKSDB_IGNORE_UNKNOWN_OPTIONS	ON
+FOUND 1 /RocksDB: Compatibility check against existing database options failed/ in my_restart.err
 select variable_name, variable_value from information_schema.global_variables where variable_name="rocksdb_ignore_unknown_options";
 variable_name	variable_value
 ROCKSDB_IGNORE_UNKNOWN_OPTIONS	ON
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test b/storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test
index 2521354..b4866de 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test
@@ -4,12 +4,13 @@ let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 let $error_log= $MYSQLTEST_VARDIR/log/my_restart.err;
 select variable_name, variable_value from information_schema.global_variables where variable_name="rocksdb_ignore_unknown_options";
 
---exec find $MYSQLD_DATADIR/.rocksdb/OPTIONS* | sort -n | tail -1 | xargs -0 -I {} -t sh -c "echo hello=world>>{}"
+--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -n | tail -1 | xargs -0 -I {} -t sh -c "echo hello=world>>{}"
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --shutdown_server 10
+
 --error 1
---exec $MYSQLD_CMD --rocksdb_ignore_unknown_options=0 --loose-console > $error_log 2>&1
+--exec $MYSQLD_CMD --plugin_load=$HA_ROCKSDB_SO --rocksdb_ignore_unknown_options=0 --loose-console --log-error=$error_log
 
 let SEARCH_FILE= $error_log;
 let SEARCH_PATTERN= RocksDB: Compatibility check against existing database options failed;
@@ -17,5 +18,5 @@ let SEARCH_PATTERN= RocksDB: Compatibility check against existing database optio
 --enable_reconnect
 --exec echo "restart" > $restart_file
 --source include/wait_until_connected_again.inc
---exec find $MYSQLD_DATADIR/.rocksdb/OPTIONS* | sort -n | tail -1 | xargs -0 -I {} -t sh -c "sed -i '/hello=world/d' {}"
+--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -n | tail -1 | xargs -0 -I {} -t sh -c "sed -i '/hello=world/d' {}"
 select variable_name, variable_value from information_schema.global_variables where variable_name="rocksdb_ignore_unknown_options";


More information about the commits mailing list