Commit 925f4dac authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

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

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
parents ae2c9929 441bb13e

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -2675,7 +2675,7 @@ void do_copy_file(struct st_command *command) 
  command	command handle



  DESCRIPTION

  chmod_file <octal> <file_name>

  chmod <octal> <file_name>

  Change file permission of <file_name>



*/

mysql-test/lib/mtr_cases.pl

+4 −6
Original line number Diff line number Diff line
@@ -32,16 +32,14 @@ my $skip_test; 


sub init_pattern {

  my ($from, $what)= @_;

  if ( $from =~ /[a-z0-9]/ ) {

  if ( $from =~ /^[a-z0-9]$/ ) {

    # Does not contain any regex, make the pattern match

    # beginning of string

    $from= "^$from";

  }

  else {

  # Check that pattern is a valid regex

  eval { "" =~/$from/; 1 } or

    mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@");

  }

  return $from;

}