diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-05-28 13:01:27 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-05-28 13:02:48 +0300 |
| commit | 1a8afb48859c099417594752ae77bb536e6348dc (patch) | |
| tree | 119ba90863f56d0575a5eaa93b527b0c4bbe0597 | |
| parent | 13c241c64f4609776169fd8a807270ad99241ca3 (diff) | |
| download | mariadb-git-1a8afb48859c099417594752ae77bb536e6348dc.tar.gz | |
MDEV-16310: rocksdb.check_ignore_unknown_options fails on OS X
Use a compatible xargs command-line arguments.
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test | 2 |
1 files changed, 1 insertions, 1 deletions
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 3316e7ea987..9e7c816ae6e 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"; |