diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/correctboolvalue.inc b/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/correctboolvalue.inc
new file mode 100644
index 0000000000000..f675aec19f98e
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/correctboolvalue.inc
@@ -0,0 +1,25 @@
+##
+# $input the value of a boolean type
+# $output the value of int type
+##
+--let $int_value=$value
+if ($value==on)
+{
+  --let $int_value=1
+}
+
+if ($value==off)
+{
+  --let $int_value=0
+}
+
+# MySQL allows 'true' and 'false' on bool values
+if ($value==true)
+{
+  --let $int_value=1
+}
+
+if ($value==false)
+{
+  --let $int_value=0
+}
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc b/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc
new file mode 100644
index 0000000000000..6ba9302667482
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc
@@ -0,0 +1,123 @@
+##
+# $sys_var name of the variable
+# $read_only - true if read-only
+# $session - true if this is session, false if global-only
+# $suppress_default_value -  if true, don't check the default value
+# valid_values table should contain valid values
+# invalid_values 
+##
+
+--eval SET @start_global_value = @@global.$sys_var
+if (!$suppress_default_value)
+{
+  SELECT @start_global_value;
+  if ($session)
+  {
+    --eval SET @start_session_value = @@session.$sys_var
+    SELECT @start_session_value;
+  }
+}
+
+if (!$read_only)
+{
+  --echo '# Setting to valid values in global scope#'
+
+  --let $i=1
+  --let $value=query_get_value(select value from valid_values, value, $i)
+  while ($value != 'No such row')
+  {
+    --echo "Trying to set variable @@global.$sys_var to $value"
+    --eval SET @@global.$sys_var   = $value
+    --eval SELECT @@global.$sys_var
+    --let $v=`SELECT @@global.$sys_var`
+    --source include/correctboolvalue.inc
+    if (!$sticky)
+    {
+      if ($v != $int_value)
+      {
+        --echo Set @@global.$sys_var to $value but it remained set to $v
+        --die Wrong variable value
+      }
+    }
+
+    --echo "Setting the global scope variable back to default"
+    --eval SET @@global.$sys_var = DEFAULT
+    --eval SELECT @@global.$sys_var
+
+    --inc $i
+    --let $value=query_get_value(select value from valid_values, value, $i)
+  }
+
+  if ($session)
+  {
+    --echo '# Setting to valid values in session scope#'
+
+    --let $i=1
+    --let $value=query_get_value(select value from valid_values, value, $i)
+    while ($value != 'No such row')
+    {
+      --echo "Trying to set variable @@session.$sys_var to $value"
+      --eval SET @@session.$sys_var   = $value
+      --eval SELECT @@session.$sys_var
+      --let $v=`SELECT @@session.$sys_var`
+      --source include/correctboolvalue.inc
+      if (!$sticky)
+      {
+        if ($v != $int_value)
+        {
+          --echo Set @@session.$sys_var to $value but it remained set to $v
+          --die Wrong variable value
+        }
+      }
+      --echo "Setting the session scope variable back to default"
+      --eval SET @@session.$sys_var = DEFAULT
+      --eval SELECT @@session.$sys_var
+
+      --inc $i
+      --let $value=query_get_value(select value from valid_values, value, $i)
+    }
+  }
+  if (!$session)
+  {
+    --echo "Trying to set variable @@session.$sys_var to 444. It should fail because it is not session."
+    --Error ER_GLOBAL_VARIABLE
+    --eval SET @@session.$sys_var   = 444
+  }
+
+  --echo '# Testing with invalid values in global scope #'
+  ####################################################################
+  #  Change the value of query_prealloc_size   to an invalid value   #
+  ####################################################################
+  --let $i=1
+  --let $value=query_get_value(select value from invalid_values, value, $i)
+  while ($value != 'No such row')
+  {
+    --echo "Trying to set variable @@global.$sys_var to $value"
+    --Error ER_WRONG_VALUE_FOR_VAR, ER_WRONG_TYPE_FOR_VAR
+    --eval SET @@global.$sys_var   = $value
+    --eval SELECT @@global.$sys_var
+    --inc $i
+    --let $value=query_get_value(select value from invalid_values, value, $i)
+  }
+}
+
+if ($read_only)
+{
+  --echo "Trying to set variable @@global.$sys_var to 444. It should fail because it is readonly."
+  --Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+  --eval SET @@global.$sys_var   = 444
+}
+
+####################################
+#     Restore initial value        #
+####################################
+if (!$read_only)
+{
+  --eval SET @@global.$sys_var = @start_global_value
+  --eval SELECT @@global.$sys_var
+  if ($session)
+  {
+    --eval SET @@session.$sys_var = @start_session_value
+    --eval SELECT @@session.$sys_var
+  }
+}
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result
index e82e987bf96f6..5715b198d5a6b 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result
@@ -7,7 +7,7 @@ ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
   KEY `kj` (`j`),
@@ -19,7 +19,7 @@ ALTER TABLE t1 ADD INDEX kj(j), ADD INDEX kij(i,j), ADD INDEX kji(j,i), ALGORITH
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
   KEY `kj` (`j`),
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result
index 122e2451f3934..5b73305cd9ead 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result
@@ -7,7 +7,7 @@ ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
   KEY `kj` (`j`),
@@ -19,7 +19,7 @@ ALTER TABLE t1 ADD INDEX kj(j), ADD INDEX kij(i,j), ADD INDEX kji(j,i), ALGORITH
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
   KEY `kj` (`j`),
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_rpl_skip_tx_api_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_rpl_skip_tx_api_basic.result
similarity index 100%
rename from storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_rpl_skip_tx_api_basic.test
rename to storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_rpl_skip_tx_api_basic.result
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_supported_compression_types_basic.result b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_supported_compression_types_basic.result
new file mode 100644
index 0000000000000..aa77d73912007
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_supported_compression_types_basic.result
@@ -0,0 +1,4 @@
+SET @start_global_value = @@global.ROCKSDB_SUPPORTED_COMPRESSION_TYPES;
+"Trying to set variable @@global.ROCKSDB_SUPPORTED_COMPRESSION_TYPES to 444. It should fail because it is readonly."
+SET @@global.ROCKSDB_SUPPORTED_COMPRESSION_TYPES   = 444;
+ERROR HY000: Variable 'rocksdb_supported_compression_types' is a read only variable
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt
new file mode 100644
index 0000000000000..8907deed6d87a
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt
@@ -0,0 +1,2 @@
+--ignore-db-dirs=.rocksdb
+
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_access_hint_on_compaction_start_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_access_hint_on_compaction_start_basic.test
index a6b753ba87aca..51765574a914a 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_access_hint_on_compaction_start_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_access_hint_on_compaction_start_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_ACCESS_HINT_ON_COMPACTION_START
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_advise_random_on_open_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_advise_random_on_open_basic.test
index b6ccea0f882de..06593363df20b 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_advise_random_on_open_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_advise_random_on_open_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_ADVISE_RANDOM_ON_OPEN
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_concurrent_memtable_write_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_concurrent_memtable_write_basic.test
index b250aa5eb7f30..4f618609223c3 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_concurrent_memtable_write_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_concurrent_memtable_write_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_ALLOW_CONCURRENT_MEMTABLE_WRITE
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_reads_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_reads_basic.test
index 067f582004527..72fed6b22754a 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_reads_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_reads_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_ALLOW_MMAP_READS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_writes_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_writes_basic.test
index 51fbf62d5a97a..8b8da14f56c2f 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_writes_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_writes_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_ALLOW_MMAP_WRITES
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_os_buffer_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_os_buffer_basic.test
index c38d0c7b210ce..bbd4140898cbf 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_os_buffer_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_os_buffer_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_ALLOW_OS_BUFFER
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_background_sync_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_background_sync_basic.test
index e0c2bd366cc0c..d8efc08226624 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_background_sync_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_background_sync_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_BACKGROUND_SYNC
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_base_background_compactions_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_base_background_compactions_basic.test
index 8e49110513a1c..9f001ce103ec3 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_base_background_compactions_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_base_background_compactions_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_BASE_BACKGROUND_COMPACTIONS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_cache_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_cache_size_basic.test
index 68715796a04eb..39688e635567d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_cache_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_cache_size_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_BLOCK_CACHE_SIZE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_restart_interval_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_restart_interval_basic.test
index 2b14e1fb65498..0688ef732810e 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_restart_interval_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_restart_interval_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_BLOCK_RESTART_INTERVAL
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_basic.test
index 11d18e3223fe1..150c1e533a73f 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_BLOCK_SIZE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_deviation_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_deviation_basic.test
index a54700aae4d6b..98d179c028c8b 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_deviation_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_deviation_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_BLOCK_SIZE_DEVIATION
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_basic.test
index 6cd9e0e156007..dd55c849adba7 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_BULK_LOAD
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_size_basic.test
index 1b57255202bcc..70d1c44806acb 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_size_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_BULK_LOAD_SIZE
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bytes_per_sync_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bytes_per_sync_basic.test
index 2958273695d72..d1d6b2b5695b5 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bytes_per_sync_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bytes_per_sync_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_BYTES_PER_SYNC
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_index_and_filter_blocks_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_index_and_filter_blocks_basic.test
index db1f593681205..27d0aa99d019d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_index_and_filter_blocks_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_index_and_filter_blocks_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_CACHE_INDEX_AND_FILTER_BLOCKS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_checksums_pct_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_checksums_pct_basic.test
index 44126e35f57fe..b595cb62a56ce 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_checksums_pct_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_checksums_pct_basic.test
@@ -11,7 +11,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_CHECKSUMS_PCT
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_collect_sst_properties_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_collect_sst_properties_basic.test
index c47c62e41b475..9c0e111d7b944 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_collect_sst_properties_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_collect_sst_properties_basic.test
@@ -3,6 +3,6 @@
 --let $sys_var=ROCKSDB_COLLECT_SST_PROPERTIES
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_commit_in_the_middle_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_commit_in_the_middle_basic.test
index 62c8e680aab63..ec860cfcfc203 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_commit_in_the_middle_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_commit_in_the_middle_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_COMMIT_IN_THE_MIDDLE
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compact_cf_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compact_cf_basic.test
index c65f722fe6efb..c5783c7344c11 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compact_cf_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compact_cf_basic.test
@@ -10,7 +10,7 @@ CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
 --let $read_only=0
 --let $session=0
 --let $sticky=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_readahead_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_readahead_size_basic.test
index ba45defb7a191..c0651a3a14dd3 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_readahead_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_readahead_size_basic.test
@@ -17,7 +17,7 @@ SELECT @@global.rocksdb_compaction_readahead_size;
 --let $sys_var=ROCKSDB_COMPACTION_READAHEAD_SIZE
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_basic.test
index 5ec719baeb6ad..24399c85d88b6 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'2000001\'');
 --let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_count_sd_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_count_sd_basic.test
index 6c35ed634f7cf..b3a437d6cd4a0 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_count_sd_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_count_sd_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES_COUNT_SD
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_file_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_file_size_basic.test
index ff132f7049cb7..aaf711792216b 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_file_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_file_size_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES_FILE_SIZE
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_window_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_window_basic.test
index b38c79b5ef07f..d5be34695c0d8 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_window_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_window_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'2000001\'');
 --let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES_WINDOW
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_if_missing_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_if_missing_basic.test
index 77422aa164c58..ab92a0a08679e 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_if_missing_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_if_missing_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_CREATE_IF_MISSING
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_missing_column_families_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_missing_column_families_basic.test
index b8aeb6c9b19f2..21c0f0ead2cab 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_missing_column_families_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_missing_column_families_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_CREATE_MISSING_COLUMN_FAMILIES
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_datadir_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_datadir_basic.test
index 20f33d6bdfd0d..fd3569c8f0a27 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_datadir_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_datadir_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_DATADIR
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_db_write_buffer_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_db_write_buffer_size_basic.test
index 7ef5422dcd391..df6a24902af08 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_db_write_buffer_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_db_write_buffer_size_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_DB_WRITE_BUFFER_SIZE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_debug_optimizer_no_zero_cardinality_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_debug_optimizer_no_zero_cardinality_basic.test
index 52e25ab358f04..41c4ae6322d26 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_debug_optimizer_no_zero_cardinality_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_debug_optimizer_no_zero_cardinality_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_DEBUG_OPTIMIZER_NO_ZERO_CARDINALITY
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_default_cf_options_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_default_cf_options_basic.test
index f756d1eb2f515..1febc6db093bf 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_default_cf_options_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_default_cf_options_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_DEFAULT_CF_OPTIONS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delete_obsolete_files_period_micros_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delete_obsolete_files_period_micros_basic.test
index 744bd946d9a89..3c2cd2db87ff2 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delete_obsolete_files_period_micros_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delete_obsolete_files_period_micros_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_DELETE_OBSOLETE_FILES_PERIOD_MICROS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disable_2pc_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disable_2pc_basic.test
index 061a4c902b5f8..04a9492c1d86c 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disable_2pc_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disable_2pc_basic.test
@@ -14,7 +14,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $read_only=0
 --let $session=0
 --let $sticky=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disabledatasync_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disabledatasync_basic.test
index b365370f21403..02778feec90c4 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disabledatasync_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_disabledatasync_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_DISABLEDATASYNC
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_bulk_load_api_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_bulk_load_api_basic.test
index 407093acbea50..52313ffbe700e 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_bulk_load_api_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_bulk_load_api_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_ENABLE_BULK_LOAD_API
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_thread_tracking_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_thread_tracking_basic.test
index 251d7d5803d06..566d56563fbf3 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_thread_tracking_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_thread_tracking_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_ENABLE_THREAD_TRACKING
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_write_thread_adaptive_yield_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_write_thread_adaptive_yield_basic.test
index 9d6502598b0dd..1904dd2cd6959 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_write_thread_adaptive_yield_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_enable_write_thread_adaptive_yield_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_ENABLE_WRITE_THREAD_ADAPTIVE_YIELD
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_error_if_exists_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_error_if_exists_basic.test
index 495770e8efb8e..933642a73a6f6 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_error_if_exists_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_error_if_exists_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_ERROR_IF_EXISTS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_flush_memtable_now_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_flush_memtable_now_basic.test
index 9529fae7516d4..4386af1ee19e9 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_flush_memtable_now_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_flush_memtable_now_basic.test
@@ -11,7 +11,7 @@ CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
 --let $read_only=0
 --let $session=0
 --let $sticky=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_index_records_in_range_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_index_records_in_range_basic.test
index 08e8d0c16deec..30263ea4aa1ab 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_index_records_in_range_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_force_index_records_in_range_basic.test
@@ -17,7 +17,7 @@ SELECT @@session.rocksdb_force_index_records_in_range;
 --let $sys_var=ROCKSDB_FORCE_INDEX_RECORDS_IN_RANGE
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_hash_index_allow_collision_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_hash_index_allow_collision_basic.test
index 5899f7b67d005..e787dd33a3417 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_hash_index_allow_collision_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_hash_index_allow_collision_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_HASH_INDEX_ALLOW_COLLISION
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_index_type_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_index_type_basic.test
index 711703c2148ee..49369ffd76577 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_index_type_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_index_type_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_INDEX_TYPE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_info_log_level_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_info_log_level_basic.test
index 990a9a6214891..fb2ce5e713bf4 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_info_log_level_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_info_log_level_basic.test
@@ -15,7 +15,7 @@ INSERT INTO invalid_values VALUES('foo');
 --let $sys_var=ROCKSDB_INFO_LOG_LEVEL
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_is_fd_close_on_exec_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_is_fd_close_on_exec_basic.test
index 741e20fac9f7d..4d39c2a3656f4 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_is_fd_close_on_exec_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_is_fd_close_on_exec_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_IS_FD_CLOSE_ON_EXEC
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_keep_log_file_num_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_keep_log_file_num_basic.test
index 511f9f8a06d58..0eff718c14c2d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_keep_log_file_num_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_keep_log_file_num_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_KEEP_LOG_FILE_NUM
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_scanned_rows_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_scanned_rows_basic.test
index 52f7f502d965e..35b4128c3e56f 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_scanned_rows_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_scanned_rows_basic.test
@@ -16,7 +16,7 @@ INSERT INTO invalid_values VALUES(1000);
 --let $sys_var=ROCKSDB_LOCK_SCANNED_ROWS
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_wait_timeout_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_wait_timeout_basic.test
index 0c524db9cbde0..24096677e1b67 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_wait_timeout_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_lock_wait_timeout_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_LOCK_WAIT_TIMEOUT
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_log_file_time_to_roll_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_log_file_time_to_roll_basic.test
index 76aee161efc97..63a7c5fedfb6e 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_log_file_time_to_roll_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_log_file_time_to_roll_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_LOG_FILE_TIME_TO_ROLL
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_manifest_preallocation_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_manifest_preallocation_size_basic.test
index 48d14fbf9f6ff..6f248ece9e95d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_manifest_preallocation_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_manifest_preallocation_size_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_MANIFEST_PREALLOCATION_SIZE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_compactions_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_compactions_basic.test
index 441c0577c10b9..61c170e84ae53 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_compactions_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_compactions_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_MAX_BACKGROUND_COMPACTIONS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_flushes_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_flushes_basic.test
index de3ab148ec688..db5b7112e9c71 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_flushes_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_background_flushes_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_MAX_BACKGROUND_FLUSHES
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_log_file_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_log_file_size_basic.test
index b0dca55e18b45..cbe5d925fdaa5 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_log_file_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_log_file_size_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_MAX_LOG_FILE_SIZE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_manifest_file_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_manifest_file_size_basic.test
index 9464f0aa1ad2d..f399b2967324c 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_manifest_file_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_manifest_file_size_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_MAX_MANIFEST_FILE_SIZE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_open_files_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_open_files_basic.test
index c82af39f7b5d3..ba3293264aba5 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_open_files_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_open_files_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_MAX_OPEN_FILES
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_row_locks_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_row_locks_basic.test
index a9e440d4b980c..4eb00329cf2bf 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_row_locks_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_row_locks_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_MAX_ROW_LOCKS
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_subcompactions_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_subcompactions_basic.test
index 0ebc9c204fb91..a4494dd82625d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_subcompactions_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_subcompactions_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_MAX_SUBCOMPACTIONS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_total_wal_size_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_total_wal_size_basic.test
index 0f881868ae27e..35ba859c6490b 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_total_wal_size_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_max_total_wal_size_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_MAX_TOTAL_WAL_SIZE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_new_table_reader_for_compaction_inputs_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_new_table_reader_for_compaction_inputs_basic.test
index cc84a2c60be45..1d2ea6e666385 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_new_table_reader_for_compaction_inputs_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_new_table_reader_for_compaction_inputs_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_NEW_TABLE_READER_FOR_COMPACTION_INPUTS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_no_block_cache_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_no_block_cache_basic.test
index 39c84fb2c2df9..be1e3e883927e 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_no_block_cache_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_no_block_cache_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_NO_BLOCK_CACHE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_override_cf_options_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_override_cf_options_basic.test
index bc680c0772a64..1f4325b89d6ee 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_override_cf_options_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_override_cf_options_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_OVERRIDE_CF_OPTIONS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_paranoid_checks_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_paranoid_checks_basic.test
index 5b0e4798678e6..5bdd9d3d50bf1 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_paranoid_checks_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_paranoid_checks_basic.test
@@ -3,5 +3,5 @@
 --let $sys_var=ROCKSDB_PARANOID_CHECKS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pause_background_work_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pause_background_work_basic.test
index fd2f30988409c..3f2f6bc703e53 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pause_background_work_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pause_background_work_basic.test
@@ -14,7 +14,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $read_only=0
 --let $session=0
 --let $sticky=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_perf_context_level_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_perf_context_level_basic.test
index 1fd61a8095510..46f7457847116 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_perf_context_level_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_perf_context_level_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_PERF_CONTEXT_LEVEL
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pin_l0_filter_and_index_blocks_in_cache_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pin_l0_filter_and_index_blocks_in_cache_basic.test
index af0950979094f..d25131062d4a1 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pin_l0_filter_and_index_blocks_in_cache_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_pin_l0_filter_and_index_blocks_in_cache_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_PIN_L0_FILTER_AND_INDEX_BLOCKS_IN_CACHE
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rate_limiter_bytes_per_sec_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rate_limiter_bytes_per_sec_basic.test
index d683e8045da8c..8277011831a70 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rate_limiter_bytes_per_sec_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rate_limiter_bytes_per_sec_basic.test
@@ -36,7 +36,7 @@ INSERT INTO invalid_values VALUES('\'aaa\''), (3.14);
 # Test all the valid and invalid values
 --let $sys_var=ROCKSDB_RATE_LIMITER_BYTES_PER_SEC
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_read_free_rpl_tables_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_read_free_rpl_tables_basic.test
index 9ff20edcfb2cf..71f42a47f4bb2 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_read_free_rpl_tables_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_read_free_rpl_tables_basic.test
@@ -9,7 +9,7 @@ CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
 --let $sys_var=ROCKSDB_READ_FREE_RPL_TABLES
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_records_in_range_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_records_in_range_basic.test
index 4fab0b3123c76..21503475e3e94 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_records_in_range_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_records_in_range_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_RECORDS_IN_RANGE
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rpl_skip_tx_api_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rpl_skip_tx_api_basic.test
index f6c0a219a9f21..f3c67a7ee3fd3 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rpl_skip_tx_api_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rpl_skip_tx_api_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_RPL_SKIP_TX_API
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_seconds_between_stat_computes_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_seconds_between_stat_computes_basic.test
index a71df41affc51..53c2e6e62bf0d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_seconds_between_stat_computes_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_seconds_between_stat_computes_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_SECONDS_BETWEEN_STAT_COMPUTES
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_signal_drop_index_thread_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_signal_drop_index_thread_basic.test
index b33f444199bf8..ea90c7b7c58dd 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_signal_drop_index_thread_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_signal_drop_index_thread_basic.test
@@ -13,7 +13,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $read_only=0
 --let $session=0
 --let $sticky=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_bloom_filter_on_read_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_bloom_filter_on_read_basic.test
index 80a9c4b3c43fc..82b56e0bbcb1d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_bloom_filter_on_read_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_bloom_filter_on_read_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_SKIP_BLOOM_FILTER_ON_READ
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_fill_cache_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_fill_cache_basic.test
index 2465e569f79c9..cc1b608b7b360 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_fill_cache_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_fill_cache_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_SKIP_FILL_CACHE
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_basic.test
index fe90a49365b5b..bbee61413057d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_basic.test
@@ -15,7 +15,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_SKIP_UNIQUE_CHECK
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_tables_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_tables_basic.test
index c64eeedb59476..3fe265ae9300b 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_tables_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_skip_unique_check_tables_basic.test
@@ -9,7 +9,7 @@ CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
 --let $sys_var=ROCKSDB_SKIP_UNIQUE_CHECK_TABLES
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_stats_dump_period_sec_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_stats_dump_period_sec_basic.test
index 7854faa8ddfa7..2fbb0c6ea6d14 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_stats_dump_period_sec_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_stats_dump_period_sec_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_STATS_DUMP_PERIOD_SEC
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_store_checksums_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_store_checksums_basic.test
index 023b6420b969e..a3ab6695689a1 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_store_checksums_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_store_checksums_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_STORE_CHECKSUMS
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_strict_collation_check_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_strict_collation_check_basic.test
index eabc45ef6be0f..17aa63b8bb303 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_strict_collation_check_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_strict_collation_check_basic.test
@@ -13,7 +13,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_STRICT_COLLATION_CHECK
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_supported_compression_types_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_supported_compression_types_basic.test
new file mode 100644
index 0000000000000..52bf63c21cced
--- /dev/null
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_supported_compression_types_basic.test
@@ -0,0 +1,7 @@
+--source include/have_rocksdb.inc
+
+--let $sys_var=ROCKSDB_SUPPORTED_COMPRESSION_TYPES
+--let $read_only=1
+--let $session=0
+--let $suppress_default_value=1
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_cache_numshardbits_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_cache_numshardbits_basic.test
index 77da9df9acdfc..11bdd6abce83d 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_cache_numshardbits_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_cache_numshardbits_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_TABLE_CACHE_NUMSHARDBITS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_stats_sampling_pct_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_stats_sampling_pct_basic.test
index c3016742042c9..3bed5e6ec739c 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_stats_sampling_pct_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_table_stats_sampling_pct_basic.test
@@ -15,7 +15,7 @@ INSERT INTO invalid_values VALUES('\'484436\'');
 --let $sys_var=ROCKSDB_TABLE_STATS_SAMPLING_PCT
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_unsafe_for_binlog_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_unsafe_for_binlog_basic.test
index 302a4173efcae..f5f4536d769f5 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_unsafe_for_binlog_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_unsafe_for_binlog_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_UNSAFE_FOR_BINLOG
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_adaptive_mutex_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_adaptive_mutex_basic.test
index a0f0a21298754..7ce7bec1f6ef2 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_adaptive_mutex_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_adaptive_mutex_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_USE_ADAPTIVE_MUTEX
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_fsync_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_fsync_basic.test
index 0d8e35d03cbba..90b41c4aa5723 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_fsync_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_use_fsync_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_USE_FSYNC
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_validate_tables_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_validate_tables_basic.test
index 6eb965c586327..ed12b319cfc5f 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_validate_tables_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_validate_tables_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_VALIDATE_TABLES
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_verify_checksums_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_verify_checksums_basic.test
index d8c9c55970325..8a8e4adbf9577 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_verify_checksums_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_verify_checksums_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_VERIFY_CHECKSUMS
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_bytes_per_sync_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_bytes_per_sync_basic.test
index eeeeed8f767c3..afab0f20d40a7 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_bytes_per_sync_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_bytes_per_sync_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_WAL_BYTES_PER_SYNC
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_dir_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_dir_basic.test
index 0d667d8de2c86..a40c77669f2c8 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_dir_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_dir_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_WAL_DIR
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_recovery_mode_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_recovery_mode_basic.test
index e0d345b42685d..ce202f2e2b580 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_recovery_mode_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_recovery_mode_basic.test
@@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_WAL_RECOVERY_MODE
 --let $read_only=0
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_size_limit_mb_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_size_limit_mb_basic.test
index d597b5d801607..95880ea3e6370 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_size_limit_mb_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_size_limit_mb_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_WAL_SIZE_LIMIT_MB
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_ttl_seconds_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_ttl_seconds_basic.test
index 9342c861168ed..e65d3851392b0 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_ttl_seconds_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_wal_ttl_seconds_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_WAL_TTL_SECONDS
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_whole_key_filtering_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_whole_key_filtering_basic.test
index ff332a6fbe480..83e8e2382a229 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_whole_key_filtering_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_whole_key_filtering_basic.test
@@ -3,4 +3,4 @@
 --let $sys_var=ROCKSDB_WHOLE_KEY_FILTERING
 --let $read_only=1
 --let $session=0
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_disable_wal_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_disable_wal_basic.test
index f7fa33e03e67f..d732bebac7ffc 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_disable_wal_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_disable_wal_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_WRITE_DISABLE_WAL
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_ignore_missing_column_families_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_ignore_missing_column_families_basic.test
index 1c9d35f4a57e2..f38b7c9601dda 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_ignore_missing_column_families_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_ignore_missing_column_families_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
 --let $sys_var=ROCKSDB_WRITE_IGNORE_MISSING_COLUMN_FAMILIES
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_sync_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_sync_basic.test
index 3655ddb8c6979..3044a038b9a68 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_sync_basic.test
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_write_sync_basic.test
@@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
 --let $sys_var=ROCKSDB_WRITE_SYNC
 --let $read_only=0
 --let $session=1
---source suite/sys_vars/inc/rocksdb_sys_var.inc
+--source include/rocksdb_sys_var.inc
 
 DROP TABLE valid_values;
 DROP TABLE invalid_values;