diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-12 11:18:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-31 19:28:58 +0200 |
| commit | d6d994bf42be0b855e3eb1c4d672a4871a186652 (patch) | |
| tree | f59e6bc257a0d5a5e70920427750021396ac5c09 /storage | |
| parent | 143e771deef47e4afdd5d8dcdaddc424f919af83 (diff) | |
| download | mariadb-git-d6d994bf42be0b855e3eb1c4d672a4871a186652.tar.gz | |
remove two redundant *.inc files to restart a server
namely, restart_mysqld_with_option.inc and kill_and_restart_mysqld.inc -
use restart_mysqld.inc instead.
Also remove innodb_wl6501_crash_stripped.inc that wasn't used anywhere.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/compression_zstd.test | 4 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_options.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/compression_zstd.test b/storage/rocksdb/mysql-test/rocksdb/t/compression_zstd.test index 263896e8487..c2216f768d0 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/compression_zstd.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/compression_zstd.test @@ -7,8 +7,8 @@ if ($no_zstd) -- Skip Requires RocksDB to be built with ZStandard Compression support } ---let $_mysqld_option=--rocksdb_default_cf_options=compression_per_level=kZSTDNotFinalCompression;compression_opts=-14:4:0; ---source include/restart_mysqld_with_option.inc +--let $restart_parameters=--rocksdb_default_cf_options=compression_per_level=kZSTDNotFinalCompression;compression_opts=-14:4:0; +--source include/restart_mysqld.inc create table t (id int primary key) engine=rocksdb; drop table t; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_options.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_options.test index 23f9b771d42..5fee66bddb6 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_options.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_options.test @@ -34,8 +34,8 @@ select cf_name, option_type, value # restart with cf configs for cf1 and cf2 --exec echo "" > $MYSQLTEST_VARDIR/log/mysqld.1.err ---let $_mysqld_option=--rocksdb_override_cf_options=cf1={write_buffer_size=8m;target_file_size_base=2m};cf2={write_buffer_size=16m;max_bytes_for_level_multiplier=8};z={target_file_size_base=4m}; ---source include/restart_mysqld_with_option.inc +--let $restart_parameters=--rocksdb_override_cf_options=cf1={write_buffer_size=8m;target_file_size_base=2m};cf2={write_buffer_size=16m;max_bytes_for_level_multiplier=8};z={target_file_size_base=4m}; +--source include/restart_mysqld.inc # check column family options in log -- should reflect individual settings |