Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/include/report-features.test

+#
+# show server variables
+#
+
+--disable_query_log
+--echo ===== ENGINES =====
+show engines; 
+--echo ===== VARIABLES =====
+show variables; 
+--echo ===== STOP =====
+--enable_query_log

mysql-test/mysql-test-run-shell.sh

@@ -1815,10 +1815,13 @@ run_testcase ()
        --result-file=*)
          result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`
          result_file="r/$result_file.result"
-         # Note that this must be set to space, not "" for test-reset to
-# work
+         # Note that this must be set to space, not "" for test-reset to work
 	 EXTRA_MASTER_OPT=" "
          ;;
+       --force-restart)
+         # Note that this must be set to space, not "" for test-reset to work
+	 EXTRA_MASTER_OPT=" "
+	 ;;
      esac
      stop_master
      stop_master 1

mysql-test/mysql-test-run.pl

@@ -185,6 +185,7 @@ our $opt_fast;
 our $opt_force;
 our $opt_reorder= 0;
 our $opt_enable_disabled;
+our $opt_report_features;
 our $opt_mem= $ENV{'MTR_MEM'};
 
 our $opt_gcov;
@@ -426,10 +427,14 @@ sub main () {
     if ( ! $need_im )
     {
      $opt_skip_im= 1;
-   }
+    }
 
     initialize_servers();
 
+    if ( $opt_report_features ) {
+      run_report_features();
+    }
+
     run_suite($opt_suite, $tests);
   }
 
@@ -594,6 +599,7 @@ sub command_line_setup () {
              'mem:s'                    => \$opt_mem,
 
              # Misc
+             'report-features'          => \$opt_report_features,
              'comment=s'                => \$opt_comment,
              'debug'                    => \$opt_debug,
              'fast'                     => \$opt_fast,
@@ -4217,6 +4223,43 @@ sub run_check_testcase ($$) {
   return $res;
 }
 
+##############################################################################
+#
+#  Report the features that were compiled in
+#
+##############################################################################
+
+sub run_report_features () {
+  my $args;
+
+  if ( ! $glob_use_embedded_server )
+  {
+    mysqld_start($master->[0],[],[]);
+    if ( ! $master->[0]->{'pid'} )
+    {
+      mtr_error("Can't start the mysqld server");
+    }
+    mysqld_wait_started($master->[0]);
+  }
+
+  my $tinfo = {};
+  $tinfo->{'name'} = 'report features';
+  $tinfo->{'result_file'} = undef;
+  $tinfo->{'component_id'} = 'mysqld';
+  $tinfo->{'path'} = 'include/report-features.test';
+  $tinfo->{'timezone'}=  "GMT-3";
+  $tinfo->{'slave_num'} = 0;
+  $tinfo->{'master_opt'} = [];
+  $tinfo->{'slave_opt'} = [];
+  $tinfo->{'slave_mi'} = [];
+  $tinfo->{'comment'} = 'report server features';
+  run_mysqltest($tinfo);
+
+  if ( ! $glob_use_embedded_server )
+  {
+    stop_all_servers();
+  }
+}
 
 
 sub run_mysqltest ($) {
@@ -4354,8 +4397,10 @@ sub run_mysqltest ($) {
   mtr_add_arg($args, "--test-file");
   mtr_add_arg($args, $tinfo->{'path'});
 
-  mtr_add_arg($args, "--result-file");
-  mtr_add_arg($args, $tinfo->{'result_file'});
+  if ( defined $tinfo->{'result_file'} ) {
+    mtr_add_arg($args, "--result-file");
+    mtr_add_arg($args, $tinfo->{'result_file'});
+  }
 
   if ( $opt_record )
   {
@@ -4768,3 +4813,4 @@ HERE
   mtr_exit(1);
 
 }
+