MyRocks: post-merge fixes part #7: make rocksdb.check_ignore_unknown_…

…options test pass

storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test

@@ -8,9 +8,8 @@ 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 -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "sed -i 's/rocksdb_version=.*/rocksdb_version=99.9.9/' {}"
-# --exec find $MYSQLD_DATADIR/.rocksdb/OPTIONS* | sort -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "echo hello=world>>{}"
+--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "sed -i 's/rocksdb_version=.*/rocksdb_version=99.9.9/' {}"
+--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "echo hello=world>>{}"
 
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -22,8 +21,8 @@ select variable_name, variable_value from information_schema.global_variables wh
 let SEARCH_FILE= $error_log;
 let SEARCH_PATTERN= RocksDB: Compatibility check against existing database options failed;
 --source include/search_pattern_in_file.inc
+--remove_file $error_log
 --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'' -e '/hello=world/d' {}"
 select variable_name, variable_value from information_schema.global_variables where variable_name="rocksdb_ignore_unknown_options";