Commit 5130e88e authored by unknown's avatar unknown
Browse files

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

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
parents f2044997 c5e5b5e1

mysql-test/mysql-test-run.pl

+20 −6
Original line number Diff line number Diff line
@@ -4745,9 +4745,7 @@ sub debugger_arguments { 
  my $exe=  shift;

  my $debugger= $opt_debugger || $opt_client_debugger;



  # FIXME Need to change the below "eq"'s to

  # "case unsensitive string contains"

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

  if ( $debugger =~ /vcexpress|vc|devenv/ )

  {

    # vc[express] /debugexe exe arg1 .. argn
@@ -4755,22 +4753,38 @@ sub debugger_arguments { 
    unshift(@$$args, "/debugexe");

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



    # Set exe to debuggername

    $$exe= $debugger;



  }

  elsif ( $debugger eq "windbg" )

  elsif ( $debugger =~ /windbg/ )

  {

    # windbg exe arg1 .. argn



    # Add name of the exe before args

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



    # Set exe to debuggername

    $$exe= $debugger;



  }

  elsif ( $debugger eq "dbx" )

  {

    # xterm -e dbx -r exe arg1 .. argn



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

    unshift(@$$args, "-r");

    unshift(@$$args, $debugger);

    unshift(@$$args, "-e");



    $$exe= "xterm";



  }

  else

  {

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

  }



  # Set exe to debuggername

  $$exe= $debugger;

}