Commit 9f390d04 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
vio/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
client/Makefile.am:
  Use local
tests/Makefile.am:
  SCCS merged
parents 2ae92c6c b727e09c

mysql-test/include/report-features.test

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#

# 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

+5 −2
Original line number Diff line number Diff line
@@ -1815,8 +1815,11 @@ 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

mysql-test/mysql-test-run.pl

+48 −3
Original line number Diff line number Diff line
@@ -432,6 +432,10 @@ sub main () { 


    initialize_servers();



    if ( $opt_report_features ) {

      run_report_features();

    }



    run_suite($opt_suite, $tests);

  }
@@ -596,6 +600,7 @@ sub command_line_setup () { 
             'mem'                      => \$opt_mem,



             # Misc

             'report-features'          => \$opt_report_features,

             'comment=s'                => \$opt_comment,

             'debug'                    => \$opt_debug,

             'fast'                     => \$opt_fast,
@@ -4263,6 +4268,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 ($) {
@@ -4400,8 +4442,10 @@ sub run_mysqltest ($) { 
  mtr_add_arg($args, "--test-file");

  mtr_add_arg($args, $tinfo->{'path'});



  if ( defined $tinfo->{'result_file'} ) {

    mtr_add_arg($args, "--result-file");

    mtr_add_arg($args, $tinfo->{'result_file'});

  }



  if ( $opt_record )

  {
@@ -4814,3 +4858,4 @@ HERE 
  mtr_exit(1);



}

mysql-test/r/have_mysql_upgrade.result

0 → 100644
+2 −0
Original line number Diff line number Diff line 
have_mysql_upgrade

1

mysql-test/t/mysql_upgrade.test

+1 −1
Original line number Diff line number Diff line 
# Only run test if "mysql_upgrade" is found

--require r/have_mysql_upgrade.inc

--require r/have_mysql_upgrade.result

--disable_query_log

select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade;

--enable_query_log