Commit 0e97b724 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 0a2cd4bb a1c46189

mysql-test/mysql-test-run.pl

+53 −2
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ our $opt_client_ddd; 
our $opt_manual_gdb;

our $opt_manual_ddd;

our $opt_manual_debug;

our $opt_debugger;

our $opt_client_debugger;



our $opt_gprof;

our $opt_gprof_dir;
@@ -603,6 +605,8 @@ sub command_line_setup () { 
             'manual-debug'             => \$opt_manual_debug,

             'ddd'                      => \$opt_ddd,

             'client-ddd'               => \$opt_client_ddd,

	     'debugger=s'               => \$opt_debugger,

	     'client-debugger=s'        => \$opt_client_debugger,

             'strace-client'            => \$opt_strace_client,

             'master-binary=s'          => \$exe_master_mysqld,

             'slave-binary=s'           => \$exe_slave_mysqld,
@@ -785,7 +789,8 @@ sub command_line_setup () { 


  # Check debug related options

  if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd ||

       $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug)

       $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug ||

       $opt_debugger || $opt_client_debugger )

  {

    # Indicate that we are using debugger

    $glob_debugger= 1;
@@ -2567,6 +2572,10 @@ sub mysqld_start ($$$$$) { 
  {

    ddd_arguments(\$args, \$exe, "$type"."_$idx");

  }

  elsif ( $opt_debugger )

  {

    debugger_arguments(\$args, \$exe, "$type"."_$idx");

  }

  elsif ( $opt_manual_debug )

  {

     print "\nStart $type in your debugger\n" .
@@ -3063,6 +3072,10 @@ sub run_mysqltest ($) { 
  {

    ddd_arguments(\$args, \$exe, "client");

  }

  elsif ( $opt_client_debugger )

  {

    debugger_arguments(\$args, \$exe, "client");

  }



  if ($glob_use_libtool and $opt_valgrind)

  {
@@ -3215,6 +3228,42 @@ sub ddd_arguments { 
  mtr_add_arg($$args, "$save_exe");

}





#

# Modify the exe and args so that program is run in the selected debugger

#

sub debugger_arguments {

  my $args= shift;

  my $exe=  shift;

  my $debugger= $opt_debugger || $opt_client_debugger;



  if ( $debugger eq "vcexpress" or $debugger eq "vc")

  {

    # vc[express] /debugexe exe arg1 .. argn



    # Add /debugexe and name of the exe before args

    unshift(@$$args, "/debugexe");

    unshift(@$$args, "$$exe");



  }

  elsif ( $debugger eq "windbg" )

  {

    # windbg exe arg1 .. argn



    # Add name of the exe before args

    unshift(@$$args, "$$exe");



  }

  else

  {

    mtr_error("Unknown argument \"$debugger\" passed to --debugger");

  }



  # Set exe to debuggername

  $$exe= $debugger;

}





#

# Modify the exe and args so that program is run in valgrind

#
@@ -3322,6 +3371,8 @@ Options for debugging the product 
  client-gdb            Start mysqltest client in gdb

  ddd                   Start mysqld in ddd

  client-ddd            Start mysqltest client in ddd

  debugger=NAME         Start mysqld in the selected debugger

  client-debugger=NAME  Start mysqltest in the selected debugger

  strace-client         FIXME

  master-binary=PATH    Specify the master "mysqld" to use

  slave-binary=PATH     Specify the slave "mysqld" to use

mysys/my_lib.c

+17 −9
Original line number Diff line number Diff line
@@ -398,14 +398,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags) 
  tmp_file[2]='*';

  tmp_file[3]='\0';



#ifdef __BORLANDC__

  if ((handle= findfirst(tmp_path,&find,0)) == -1L)

    goto error;

#else

  if ((handle=_findfirst(tmp_path,&find)) == -1L)

    goto error;

#endif



  if (!(buffer= my_malloc(ALIGN_SIZE(sizeof(MY_DIR)) + 

                          ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +

                          sizeof(MEM_ROOT), MyFlags)))
@@ -426,6 +418,22 @@ MY_DIR *my_dir(const char *path, myf MyFlags) 
  /* MY_DIR structure is allocated and completly initialized at this point */

  result= (MY_DIR*)buffer;



#ifdef __BORLANDC__

  if ((handle= findfirst(tmp_path,&find,0)) == -1L)

#else

  if ((handle=_findfirst(tmp_path,&find)) == -1L)

#endif

  {

    DBUG_PRINT("info", ("find_first returned error"));

    if  (errno != EINVAL)

      goto error;

    /*

      Could not read the directory, no read access.

      Probably because by "chmod -r".

      continue and return zero files in dir

    */

  }



  do

  {

#ifdef __BORLANDC__