Commit 1c1e65e9 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 

into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents fd141956 5c8da505

client/mysqltest.c

+12 −1
Original line number Diff line number Diff line
@@ -818,6 +818,9 @@ void verbose_msg(const char *fmt, ...) 


  va_start(args, fmt);

  fprintf(stderr, "mysqltest: ");

  if (cur_file && cur_file != file_stack)

    fprintf(stderr, "In included file \"%s\": ",

            cur_file->file_name);

  if (start_lineno != 0)

    fprintf(stderr, "At line %u: ", start_lineno);

  vfprintf(stderr, fmt, args);
@@ -839,7 +842,15 @@ void warning_msg(const char *fmt, ...) 
  dynstr_append(&ds_warning_messages, "mysqltest: ");

  if (start_lineno != 0)

  {

    len= my_snprintf(buff, sizeof(buff), "Warning detected at line %d: ",

    dynstr_append(&ds_warning_messages, "Warning detected ");

    if (cur_file && cur_file != file_stack)

    {

      len= my_snprintf(buff, sizeof(buff), "in included file %s ",

                       cur_file->file_name);

      dynstr_append_mem(&ds_warning_messages,

                        buff, len);

    }

    len= my_snprintf(buff, sizeof(buff), "at line %d: ",

                     start_lineno);

    dynstr_append_mem(&ds_warning_messages,

                      buff, len);

mysql-test/include/ctype_like_escape.inc

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ insert into t1 values('ab_def'); 
insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

-- should return ab_def

# should return ab_def

select c1 as c1u from t1 where c1 like 'ab\_def';

-- should return ab_def

# should return ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

drop table t1;

mysql-test/mysql-test-run.pl

+11 −9
Original line number Diff line number Diff line
@@ -1180,9 +1180,10 @@ sub check_mysqld_features () { 
      # Look for version

      if ( $line =~ /^$exe_mysqld\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ )

      {

	print "Major: $1 Minor: $2 Build: $3\n";

	#print "Major: $1 Minor: $2 Build: $3\n";

	$mysql_version_id= $1*10000 + $2*100 + $3;

	print "mysql_version_id: $mysql_version_id\n";

	#print "mysql_version_id: $mysql_version_id\n";

	mtr_report("MySQL Version $1.$2.$3");

      }

    }

    else
@@ -2703,15 +2704,16 @@ sub do_before_run_mysqltest($) 
  my $tinfo= shift;

  my $tname= $tinfo->{'name'};



  # Remove old reject file

  if ( $opt_suite eq "main" )

  # Remove old files produced by mysqltest

  my $result_dir= "r";

  if ( ! $opt_suite eq "main" )

  {

    unlink("r/$tname.reject");

  }

  else

  {

    unlink("suite/$opt_suite/r/$tname.reject");

    $result_dir= "suite/$opt_suite/r";

  }

  unlink("$result_dir/$tname.reject");

  unlink("$result_dir/$tname.progress");

  unlink("$result_dir/$tname.log");

  unlink("$result_dir/$tname.warnings");



  mtr_tonewfile($path_current_test_log,"$tname\n"); # Always tell where we are