Commit 4ce742f0 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents b29be567 3f45e43c

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ sub check_mysqld_features () { 
  # print out version and a list of all features and settings

  #

  my $found_variable_list_start= 0;

  my $spec_file= "$opt_vardir/mysqld.spec";

  my $spec_file= "$glob_mysql_test_dir/mysqld.spec.$$";

  if ( mtr_run($exe_mysqld,

	       ["--no-defaults",

	        "--verbose",