revision-id: b2d48d6a6f5db2435595811ea47f068ee5d23ffd parent(s): b8fdd56a4d64d9bb02f2e3e9609af82e558cbcb5 committer: Sergei Petrunia branch nick: 10.2-r11 timestamp: 2018-05-28 13:01:27 +0300 message: MDEV-16310: rocksdb.check_ignore_unknown_options fails on OS X Use a compatible xargs command-line arguments. --- storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3316e7e..9e7c816 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 @@ -22,5 +22,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'' -e '/hello=world/d' {}" select variable_name, variable_value from information_schema.global_variables where variable_name="rocksdb_ignore_unknown_options";