Commit bbc02113 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
parents fbff02d1 2520c2c6

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1994,7 +1994,7 @@ sub run_mysqltest ($$) { 
  }



  my $cmdline_mysqlbinlog=

    "$exe_mysqlbinlog --no-defaults --local-load=$opt_tmpdir";

    "$exe_mysqlbinlog --no-defaults --local-load=$opt_tmpdir --character-sets-dir=$path_charsetsdir";



  if ( $opt_debug )

  {