Commit a0699cd8 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Manual merge 5.0->5.1
parents ee10d9e7 fde587eb

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ sub environment_setup () { 
  # ----------------------------------------------------

  my $cmdline_mysqlbinlog=

    mtr_native_path($exe_mysqlbinlog) .

      " --no-defaults --disable-force-if-open --debug-info --local-load=$opt_tmpdir";

      " --no-defaults --disable-force-if-open --debug-info";

  if ( !$opt_extern && $mysql_version_id >= 50000 )

  {

    $cmdline_mysqlbinlog .=" --character-sets-dir=$path_charsetsdir";