diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9e16846..f00e900 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1031,6 +1031,11 @@ sub command_line_setup {
     }
   }
 
+  foreach my $arg ( @opt_extra_mysqld_opt )
+  {
+    update_mysqld_features( $arg );
+  }
+
   # --------------------------------------------------------------------------
   # Find out type of logging that are being used
   # --------------------------------------------------------------------------
@@ -1381,6 +1386,25 @@ sub set_build_thread_ports($) {
 
 }
 
+sub update_mysqld_features {
+  my $arg = $_[0];
+
+  if ( $arg =~ /^--(\S+)=(\S+)$/ )
+  {
+    # print "mva: $1= $2\n";
+    $mysqld_variables{$1}= $2;
+  }
+  elsif ( $arg =~ /^--skip-(\S+)$/ )
+  {
+    # print "mvb: $1 = OFF\n";
+    $mysqld_variables{$1}= "OFF";
+  }
+  elsif ( $arg =~ /^--(\S+)$/ )
+  {
+    # print "mvc: $1 = ON\n";
+    $mysqld_variables{$1}= "ON";
+  }
+}
 
 sub collect_mysqld_features {
   my $found_variable_list_start= 0;