Commit f7d5d23c authored by unknown's avatar unknown
Browse files

Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint 

into  ymer.(none):/usr/local/mysql/x/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 7d305e27 e167d79e

mysql-test/mysql-test-run.pl

+8 −0
Original line number Diff line number Diff line
@@ -310,6 +310,8 @@ our %mysqld_variables; 


my $source_dist= 0;



our $opt_max_save_core= 5;

my $num_saved_cores= 0;  # Number of core files saved in vardir/log/ so far.



######################################################################

#
@@ -570,6 +572,7 @@ sub command_line_setup () { 
             'strace-client'            => \$opt_strace_client,

             'master-binary=s'          => \$exe_master_mysqld,

             'slave-binary=s'           => \$exe_slave_mysqld,

             'max-save-core=i'          => \$opt_max_save_core,



             # Coverage, profiling etc

             'gcov'                     => \$opt_gcov,
@@ -3418,10 +3421,12 @@ sub save_files_before_restore($$) { 
  # Look for core files

  foreach my $core_file ( glob("$data_dir/core*") )

  {

    last if $opt_max_save_core > 0 && $num_saved_cores >= $opt_max_save_core;

    my $core_name= basename($core_file);

    mtr_report("Saving $core_name");

    mkdir($save_name) if ! -d $save_name;

    rename("$core_file", "$save_name/$core_name");

    ++$num_saved_cores;

  }

}
@@ -5020,6 +5025,9 @@ Options for debugging the product 
  master-binary=PATH    Specify the master "mysqld" to use

  slave-binary=PATH     Specify the slave "mysqld" to use

  strace-client         Create strace output for mysqltest client

  max-save-core         Limit the number of core files saved (to avoid filling

                        up disks for heavily crashing server). Defaults to

                        $opt_max_save_core, set to 0 for no limit.



Options for coverage, profiling etc