Commit 92930c12 authored by unknown's avatar unknown
Browse files

Merge 192.168.0.4:mysql/mysql-4.1-maint 

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


client/mysqltest.c:
  Auto merged
parents fba971f5 a599cea1

client/mysqltest.c

+1 −3
Original line number Diff line number Diff line
@@ -6456,7 +6456,7 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 
{

  my_regex_t r;

  my_regmatch_t *subs;

  char *buf_end, *replace_end;

  char *replace_end;

  char *buf= *buf_p;

  int len;

  int buf_len, need_buf_len;
@@ -6476,8 +6476,6 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 


  SECURE_REG_BUF



    buf_end= buf + buf_len;



  if (icase)

    cflags|= REG_ICASE;

mysql-test/lib/mtr_report.pl

+6 −1
Original line number Diff line number Diff line
@@ -34,7 +34,12 @@ sub mtr_verbose (@); 
# We can't use diff -u or diff -a as these are not portable



sub mtr_show_failed_diff ($) {

  my $tname=  shift;

  my $result_file_name=  shift;



  # The reject and log files have been dumped to

  # to filenames based on the result_file's name

  my $tname= basename($result_file_name);

  $tname=~ s/\..*$//;



  my $reject_file=  "r/$tname.reject";

  my $result_file=  "r/$tname.result";

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -3203,7 +3203,7 @@ sub report_failure_and_restart ($) { 
  my $tinfo= shift;



  mtr_report_test_failed($tinfo);

  mtr_show_failed_diff($tinfo->{'name'});

  mtr_show_failed_diff($tinfo->{'result_file'});

  print "\n";

  if ( $opt_force )

  {