Write information about restart in .result

Idea comes from MySQL which does something similar

22 files changed, 45 insertions, 0 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
index de7717b3480..1e59dd0daec 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
@@ -391,6 +391,7 @@ set global rocksdb_force_flush_memtable_now=1;
 ALTER TABLE t1 ADD INDEX kj(j), ALGORITHM=INPLACE;
 larger
 1
+# restart
 larger
 1
 Table	Op	Msg_type	Msg_text
@@ -398,6 +399,7 @@ test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 larger
 1
+# restart
 larger
 1
 Table	Op	Msg_type	Msg_text
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result
index a8d5c07072c..96d25b2e669 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result
@@ -62,6 +62,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -171,6 +172,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -254,6 +256,7 @@ SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	YES		NULL	
 b	char(8)	YES		NULL	
+# restart
 INSERT INTO t1 (a,b) VALUES (35,'foo');
 INSERT INTO t1 (a,b) VALUES (35,'foo');
 INSERT INTO t1 (a,b) VALUES (36,'foo');
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result
index 5d947603ec5..27722b23927 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result
@@ -63,6 +63,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -147,6 +148,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -228,6 +230,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -311,6 +314,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -401,6 +405,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -484,6 +489,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -568,6 +574,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -747,6 +754,7 @@ a	b
 123	bbb
 321	ccc
 321	ccc
+# restart
 INSERT INTO t1 (a,b) VALUES (45,'bob');
 SELECT * FROM t1;
 a	b
@@ -788,6 +796,7 @@ t1	CREATE TABLE `t1` (
   `i` int(11) NOT NULL AUTO_INCREMENT,
   KEY `i` (`i`)
 ) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
+# restart
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_secondary.result b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_secondary.result
index 100bc5fd638..c6dcb023e06 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_secondary.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_secondary.result
@@ -6,6 +6,7 @@ pk	a
 3	1
 2	2
 1	3
+# restart
 INSERT INTO t1 (pk) VALUES (4);
 SELECT * FROM t1;
 pk	a
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter3.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter3.result
index 6ad9867049d..773fb68e07e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter3.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter3.result
@@ -1,3 +1,4 @@
+# restart
 CREATE TABLE `linktable` (
 `id1` bigint(20) unsigned NOT NULL DEFAULT '0',
 `id1_type` int(10) unsigned NOT NULL DEFAULT '0',
@@ -74,6 +75,7 @@ select case when variable_value-@c = 0 then 'true' else 'false' end from informa
 case when variable_value-@c = 0 then 'true' else 'false' end
 true
 DROP TABLE linktable;
+# restart
 #
 # bloom filter prefix is 20 byte
 #  Create a key which is longer than that, so that we see that  
@@ -98,6 +100,7 @@ insert into t1 values (10,1,1,0x12FFFFFFFFFF,1);
 insert into t1 values (11,1,1,0x12FFFFFFFFFF,1);
 insert into t1 values (20,2,2,0x12FFFFFFFFFF,1);
 insert into t1 values (21,2,2,0x12FFFFFFFFFF,1);
+# restart
 explain 
 select * from t1 where kp0=1 and kp1=1 and kp2=0x12FFFFFFFFFF order by kp3 desc;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
index 4ea8cbccc1e..995da9e88eb 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
@@ -86,6 +86,7 @@ INSERT INTO t1 VALUES(51479+0.333333333,1);
 DROP TABLE t1;
 SET @@global.table_open_cache=@orig_table_open_cache;
 FOUND 1 /RocksDB: Error [0-9]+ finalizing bulk load while closing handler/ in rocksdb.bulk_load_errors.3.err
+# restart
 CREATE TABLE t1 (pk INT, PRIMARY KEY (pk)) ENGINE=ROCKSDB;
 CREATE TABLE t2 (pk INT, PRIMARY KEY (pk)) ENGINE=ROCKSDB;
 SET rocksdb_bulk_load=1;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result b/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result
index ce29ee04b30..5416bc995da 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/cardinality.result
@@ -1,3 +1,4 @@
+# restart
 CREATE TABLE t0 (id int PRIMARY KEY, a int, INDEX ix_a (a))  engine=rocksdb;
 insert into t0 values (0, 0),(1, 1),(2, 2),(3, 3),(4, 4),
 (5, 4),(6, 4),(7, 4),(8, 4),(9, 4);
@@ -66,6 +67,7 @@ SELECT table_name, table_rows FROM information_schema.tables WHERE table_schema
 table_name	table_rows
 t1	100000
 restarting...
+# restart
 show index in t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	PRIMARY	1	id	A	100000	NULL	NULL		LSMTREE		
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/compression_zstd.result b/storage/rocksdb/mysql-test/rocksdb/r/compression_zstd.result
index 62a6dbbdaca..2c1cab7fcac 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/compression_zstd.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/compression_zstd.result
@@ -1,2 +1,3 @@
+# restart: --rocksdb_default_cf_options=compression_per_level=kZSTDNotFinalCompression;compression_opts=-14:4:0;
 create table t (id int primary key) engine=rocksdb;
 drop table t;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result
index 44f4af7b30f..668f7e8f47e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result
@@ -57,6 +57,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`),
   KEY `kc` (`c`)
 ) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
+# restart
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -117,6 +118,7 @@ SHOW INDEX IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	PRIMARY	1	a	A	0	NULL	NULL		LSMTREE		
 t1	0	kc	1	c	A	0	NULL	NULL	YES	LSMTREE		
+# restart
 INSERT INTO t1 (b,c) VALUES (1,2);
 INSERT INTO t1 (b,c) VALUES (3,4);
 INSERT INTO t1 (b,c) VALUES (5,6);
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/drop_table2.result b/storage/rocksdb/mysql-test/rocksdb/r/drop_table2.result
index fad2939d206..aec4138c722 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/drop_table2.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/drop_table2.result
@@ -10,6 +10,7 @@ call mtr.add_suppression("Column family 'rev:cf2' not found");
 set global rocksdb_compact_cf = 'cf1';
 set global rocksdb_compact_cf = 'rev:cf2';
 set global rocksdb_signal_drop_index_thread = 1;
+# restart
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -38,10 +39,12 @@ DELETE FROM t1;
 DELETE FROM t2;
 DELETE FROM t3;
 DELETE FROM t4;
+# restart
 DELETE FROM t1;
 DELETE FROM t4;
 DELETE FROM t1;
 DELETE FROM t4;
+# restart
 CREATE TABLE t5 (
 a int not null,
 b int not null,
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/drop_table3.result b/storage/rocksdb/mysql-test/rocksdb/r/drop_table3.result
index 7a33fa83cb4..954e6079bba 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/drop_table3.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/drop_table3.result
@@ -6,6 +6,7 @@ call mtr.add_suppression("Column family 'rev:cf2' not found");
 set global rocksdb_compact_cf = 'cf1';
 set global rocksdb_compact_cf = 'rev:cf2';
 set global rocksdb_signal_drop_index_thread = 1;
+# restart
 CREATE TABLE t1 (
 a int not null,
 b int not null,
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/max_open_files.result b/storage/rocksdb/mysql-test/rocksdb/r/max_open_files.result
index 5d34f4e9640..d3aac194bc4 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/max_open_files.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/max_open_files.result
@@ -19,3 +19,4 @@ SELECT @@global.rocksdb_max_open_files;
 SELECT FLOOR(@@global.open_files_limit / 2) = @@global.rocksdb_max_open_files;
 FLOOR(@@global.open_files_limit / 2) = @@global.rocksdb_max_open_files
 1
+# restart
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/records_in_range.result b/storage/rocksdb/mysql-test/rocksdb/r/records_in_range.result
index 228e1313e74..0a42e730fe6 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/records_in_range.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/records_in_range.result
@@ -1,3 +1,4 @@
+# restart
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
 i INT,
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
index e18bb5f9c0c..d8d78a2f571 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
@@ -1399,6 +1399,7 @@ create table t1 (i int primary key auto_increment) engine=RocksDB;
 insert into t1 values (null);
 insert into t1 values (null);
 SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK = @ORIG_PAUSE_BACKGROUND_WORK;
+# restart
 SET @ORIG_PAUSE_BACKGROUND_WORK = @@ROCKSDB_PAUSE_BACKGROUND_WORK;
 SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK = 1;
 insert into t1 values (null);
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_cf_options.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_cf_options.result
index 6c3d85b760c..80b6301a07c 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_cf_options.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_cf_options.result
@@ -7,6 +7,7 @@ primary key (a) comment 'z') engine=rocksdb;
 insert into t1 values (1);
 insert into t2 values (2);
 insert into t3 values (2);
+# restart
 
 Default options for all column families:
 
@@ -32,6 +33,7 @@ z	WRITE_BUFFER_SIZE	12582912
 __system__	MAX_BYTES_FOR_LEVEL_MULTIPLIER	10.000000
 __system__	TARGET_FILE_SIZE_BASE	1048576
 __system__	WRITE_BUFFER_SIZE	12582912
+# restart: --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};
 
 Individualized options for column families:
 
@@ -57,5 +59,6 @@ z	WRITE_BUFFER_SIZE	12582912
 __system__	MAX_BYTES_FOR_LEVEL_MULTIPLIER	10.000000
 __system__	TARGET_FILE_SIZE_BASE	1048576
 __system__	WRITE_BUFFER_SIZE	12582912
+# restart: --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};
 
 drop table t1,t2,t3;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result
index 505487c08ba..dbc89f32d90 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result
@@ -125,4 +125,5 @@ set session debug_dbug= "-d,myrocks_simulate_bad_key_checksum1";
 set @@global.rocksdb_store_row_debug_checksums=@save_rocksdb_store_row_debug_checksums;
 set @@global.rocksdb_verify_row_debug_checksums=@save_rocksdb_verify_row_debug_checksums;
 set @@global.rocksdb_checksums_pct=@save_rocksdb_checksums_pct;
+# restart
 drop table t2,t3,t4;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_parts.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_parts.result
index 2fde11c2a08..70bef39eceb 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_parts.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_parts.result
@@ -131,6 +131,7 @@ DROP DATABASE db3;
 CREATE TABLE t1 (a INT) ENGINE=RocksDB PARTITION BY HASH(a) PARTITIONS 2;
 INSERT INTO t1 (a) VALUES (1),(2);
 ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
+# restart
 SELECT 1;
 1
 1
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result b/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result
index 92906f22b1e..d67c4cbbbc7 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result
@@ -1,4 +1,5 @@
 create table t1 (pk int primary key) engine=rocksdb;
+# restart
 show tables;
 Tables_in_test
 #mysql50#t1#sql-test
@@ -11,6 +12,7 @@ show tables;
 Tables_in_test
 #mysql50#t1#sql-test
 t2
+# restart
 show tables;
 Tables_in_test
 create table t2 (pk int primary key) engine=rocksdb;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/statistics.result b/storage/rocksdb/mysql-test/rocksdb/r/statistics.result
index 24f3463bf11..9fdd50a7e14 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/statistics.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/statistics.result
@@ -37,6 +37,7 @@ table_name	data_length>0	index_length>0
 t1	1	1
 t2	1	1
 t3	1	1
+# restart
 SELECT table_name, table_rows FROM information_schema.tables WHERE table_schema = DATABASE();
 table_name	table_rows
 t1	100000
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/truncate_table3.result b/storage/rocksdb/mysql-test/rocksdb/r/truncate_table3.result
index eda560fefdb..7c5631a2c97 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/truncate_table3.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/truncate_table3.result
@@ -6,6 +6,7 @@ call mtr.add_suppression("Column family 'rev:cf2' not found");
 set global rocksdb_compact_cf = 'cf1';
 set global rocksdb_compact_cf = 'rev:cf2';
 set global rocksdb_signal_drop_index_thread = 1;
+# restart
 CREATE TABLE t1 (
 a int not null,
 b int not null,
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result
index e8456457cdd..eda49c58d7e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads_writes.result
@@ -5,10 +5,13 @@ select plugin_name, plugin_type from information_schema.plugins where plugin_nam
 plugin_name	plugin_type
 ROCKSDB	STORAGE ENGINE
 Checking direct reads
+# restart
 FOUND 1 /enable both use_direct_reads/ in use_direct_reads_writes.err
 Checking direct writes
+# restart
 FOUND 1 /enable both use_direct_io_for_flush_and_compaction/ in use_direct_reads_writes.err
 Checking rocksdb_flush_log_at_trx_commit
+# restart
 FOUND 1 /rocksdb_flush_log_at_trx_commit needs to be/ in use_direct_reads_writes.err
 Validate flush_log settings when direct writes is enabled
 set global rocksdb_flush_log_at_trx_commit=0;
@@ -16,3 +19,4 @@ set global rocksdb_flush_log_at_trx_commit=1;
 ERROR 42000: Variable 'rocksdb_flush_log_at_trx_commit' can't be set to the value of '1'
 set global rocksdb_flush_log_at_trx_commit=2;
 ERROR 42000: Variable 'rocksdb_flush_log_at_trx_commit' can't be set to the value of '2'
+# restart
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/xa.result b/storage/rocksdb/mysql-test/rocksdb/r/xa.result
index 30cfe94e0b7..12ae2b474b6 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/xa.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/xa.result
@@ -18,6 +18,7 @@ XA PREPARE 'xa2';
 connection default;
 SELECT * FROM t1;
 a
+# restart
 connect  con3,localhost,root,,test;
 XA RECOVER;
 formatID	gtrid_length	bqual_length	data