Fix the merge of rocksdb_sys_vars test suite

storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc

@@ -17,13 +17,6 @@ if (!$suppress_default_value)
     SELECT @start_session_value;
   }
 }
-SELECT @start_global_value;
-if ($session)
-{
-  --eval SET @start_session_value = @@session.$sys_var
-  SELECT @start_session_value;
-}
-}
 
 if (!$read_only)
 {

storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_update_cf_options_basic.test

 --source include/have_rocksdb.inc
+--source include/have_partition.inc
 
 call mtr.add_suppression("MyRocks: NULL is not a valid option for updates to column family settings.");
 call mtr.add_suppression("Invalid cf options, '=' expected *");
@@ -91,4 +92,4 @@ SELECT @@global.rocksdb_update_cf_options;
 
 USE test;
 
-DROP TABLE t1;
\ No newline at end of file
+DROP TABLE t1;