MariaRocks port: Use another way to handle --force-restart

Based on discussion at maria-developers@:
- Remove 'Support --force-restart "pseudo-argument"'
  that was added a few csets before
- Instead, use "source include/restart_mysqld.inc" in the
  testcases that need a freshly-started server

mysql-test/lib/mtr_cases.pm

@@ -604,14 +604,6 @@ sub process_opts {
       # Fallthrough, add the --default-time-zone option
     }
 
-    # --force-restart is a "fake" option which just signals MTR that
-    # it should restart the mysqld server even if it was started with
-    # a matching set of options
-    if ($opt eq "--force-restart") {
-      $tinfo->{'force_restart'}= 1;
-      next;
-    }
-
     # Ok, this was a real option, add it
     push(@{$tinfo->{$opt_name}}, $opt);
   }

mysql-test/mysql-test-run.pl

@@ -5164,6 +5164,7 @@ sub stop_all_servers () {
 # Find out if server should be restarted for this test
 sub server_need_restart {
   my ($tinfo, $server)= @_;
+
   if ( using_extern() )
   {
     mtr_verbose_restart($server, "no restart for --extern server");
@@ -5256,11 +5257,7 @@ sub server_need_restart {
 
 sub servers_need_restart($) {
   my ($tinfo)= @_;
-  if (defined($tinfo->{'force_restart'})) {
-    return all_servers();
-  } else {
-    return grep { server_need_restart($tinfo, $_); } all_servers();
-  }
+  return grep { server_need_restart($tinfo, $_); } all_servers();
 }
 
 

storage/rocksdb/mysql-test/rocksdb/t/cardinality-master.opt

@@ -1,4 +1,3 @@
 --skip-rocksdb_debug_optimizer_no_zero_cardinality
 --rocksdb_compaction_sequential_deletes=0
---force-restart
 --rocksdb_table_stats_sampling_pct=100

storage/rocksdb/mysql-test/rocksdb/t/cardinality.test

@@ -1,5 +1,7 @@
 --source include/have_rocksdb.inc
 
+--source include/restart_mysqld.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

storage/rocksdb/mysql-test/rocksdb/t/information_schema-master.opt

@@ -1 +1 @@
---force-restart --binlog_format=row --gtid_mode=ON --enforce_gtid_consistency --log_slave_updates
+--binlog_format=row --gtid_mode=ON --enforce_gtid_consistency --log_slave_updates

storage/rocksdb/mysql-test/rocksdb/t/information_schema.test

@@ -1,6 +1,8 @@
 --source include/have_rocksdb.inc
 --source include/have_log_bin.inc
 
+--source include/restart_mysqld.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;

storage/rocksdb/mysql-test/rocksdb/t/mysqldump-master.opt

@@ -1 +1 @@
---force-restart --binlog_format=row
+--binlog_format=row

storage/rocksdb/mysql-test/rocksdb/t/mysqldump.test

@@ -4,6 +4,8 @@
 
 --enable_connect_log
 
+--source include/restart_mysqld.inc
+
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 

storage/rocksdb/mysql-test/rocksdb/t/records_in_range-master.opt

@@ -1,4 +1,3 @@
---force-restart
 --rocksdb_debug_optimizer_n_rows=20000
 --rocksdb_records_in_range=1000
 --rocksdb_table_stats_sampling_pct=100

storage/rocksdb/mysql-test/rocksdb/t/records_in_range.test

@@ -1,5 +1,7 @@
 --source include/have_rocksdb.inc
 
+--source include/restart_mysqld.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

storage/rocksdb/mysql-test/rocksdb/t/show_engine-master.opt

@@ -1 +0,0 @@
---force-restart

storage/rocksdb/mysql-test/rocksdb/t/show_engine.test

@@ -1,6 +1,8 @@
 --source include/have_rocksdb.inc
 --source include/have_partition.inc
 
+--source include/restart_mysqld.inc
+
 #
 # SHOW ENGINE STATUS command
 # Checking that the command doesn't produce an error.