Commit 8b01c318 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

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


client/mysql_upgrade.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents 3477b50a 236ed28e

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -17,3 +17,5 @@ 
452a92d0-31-8wSzSfZi165fcGcXPA

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454f8960jsVT_kMKJtZ9OCgXoba0xQ

4554a95d7txO1DuO9G3nAizI3SkFAA

4554b3722d71SbPiI2Gx-RhbZjmuIQ

client/mysql_upgrade.c

+16 −21
Original line number Diff line number Diff line
@@ -386,18 +386,18 @@ find_file(const char *name, const char *root, uint flags, char *result, size_t l 


  cp= strmake(result, root, len);

  if (cp[-1] != FN_LIBCHAR) 

    *cp= FN_LIBCHAR; 

    *cp++= FN_LIBCHAR; 

  

  ret= 1;

  va_start(va, len);

  subdir= (!(flags & MY_SEARCH_SELF)) ? va_arg(va, char *) : "";

  while (ret && subdir)

  while (subdir)

  {

    MY_DIR *dir;

    FILEINFO *match;

    char *cp1;

    

    cp1= strnmov(cp + 1, subdir, len - (cp - result) - 1);

    cp1= strnmov(cp, subdir, len - (cp - result) - 1);

    

    dir= my_dir(result, (flags & MY_ISDIR) ? MY_WANT_STAT : MYF(0));  

    if (dir)
@@ -406,25 +406,20 @@ find_file(const char *name, const char *root, uint flags, char *result, size_t l 
                      sizeof(FILEINFO), (qsort_cmp)comp_names);

      if (match)

      {

        if (!(flags & MY_PARENT)) 

        ret= (flags & MY_ISDIR) ? !MY_S_ISDIR(match->mystat->st_mode) : 0;

        if (!ret)

        { 

          if (cp1[-1] != FN_LIBCHAR)

            *cp1++= FN_LIBCHAR;

          

          if (!(flags & MY_PARENT)) 

            strnmov(cp1, name, len - (cp1 - result));

        }

          else

        {

          if (cp1[-1] == FN_LIBCHAR)

            --cp1;

          while (*--cp1 == FN_LIBCHAR)

          {}

          *++cp1= FN_LIBCHAR;

          *++cp1= '\0';

            *cp1= '\0';

          

          my_dirend(dir);

          break;

        }

        if (flags & MY_ISDIR)

          ret= !MY_S_ISDIR(match->mystat->st_mode);

        else

          ret= 0;

      }

      my_dirend(dir);

    }
@@ -484,7 +479,7 @@ int main(int argc, char **argv) 
       || find_file(mysqld_name, basedir, MYF(0), path, sizeof(path),

                              "bin", "libexec", NullS))

    {

      my_strdup((gptr)basedir, MYF(0));

      my_free((gptr)basedir, MYF(0));

      basedir= (char *)DEFAULT_MYSQL_HOME;

    }

  }

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.pl

+49 −3
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ our $opt_ndbcluster_port_slave; 
our $opt_ndbconnectstring_slave;



our $opt_record;

our $opt_report_features;

our $opt_check_testcases;



our $opt_skip;
@@ -431,6 +432,10 @@ sub main () { 


    initialize_servers();



    if ( $opt_report_features ) {

      run_report_features();

    }



    run_suite($opt_suite, $tests);

  }
@@ -595,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,
@@ -4255,6 +4261,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 ($) {
@@ -4392,8 +4435,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 )

  {
@@ -4807,3 +4852,4 @@ HERE 
  mtr_exit(1);



}

mysql-test/mysql-test-run.sh

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