Commit 519dc92c authored by unknown's avatar unknown
Browse files

BUG#22396 crash_commit_before 

 - Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.


mysql-test/mysql-test-run.pl:
  Allow --skip-core-file to be specified in master.opt file, which will turn
  off the default behaviour to generate core file.
  Remove the option --exit-info from being passed to myslqd when it's started. If used 
  it will just overwrite all the options for skip-stack-trace etc.
mysql-test/t/disabled.def:
  Enable crash_commit_before
mysql-test/t/crash_commit_before-master.opt:
  Run crash_commit_before test case without core file and stack trace.
parent d0a8a628

mysql-test/mysql-test-run.pl

+15 −5
Original line number Diff line number Diff line
@@ -2877,7 +2877,7 @@ sub mysqld_arguments ($$$$$) { 
  mtr_add_arg($args, "%s--console", $prefix);

  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);

  mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);

  mtr_add_arg($args, "%s--core", $prefix);



  mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);

  mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);

  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
@@ -2938,8 +2938,6 @@ sub mysqld_arguments ($$$$$) { 


    mtr_add_arg($args, "%s--datadir=%s", $prefix,

                $slave->[$idx]->{'path_myddir'});

    # FIXME slave get this option twice?!

    mtr_add_arg($args, "%s--exit-info=256", $prefix);

    mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);

    if (! $opt_skip_slave_binlog)

    {
@@ -3057,10 +3055,23 @@ sub mysqld_arguments ($$$$$) { 
    mtr_add_arg($args, "%s--user=root", $prefix);

  }



  my $found_skip_core= 0;

  foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )

  {

    # Allow --skip-core-file to be set in master.opt file

    if ($arg eq "--skip-core-file")

    {

      $found_skip_core= 1;

    }

    else

    {

      mtr_add_arg($args, "%s%s", $prefix, $arg);

    }

  }

  if ( !$found_skip_core )

  {

    mtr_add_arg($args, "%s%s", $prefix, "--core-file");

  }



  if ( $opt_bench )

  {
@@ -3069,7 +3080,6 @@ sub mysqld_arguments ($$$$$) { 
  }

  elsif ( $type eq 'master' )

  {

    mtr_add_arg($args, "%s--exit-info=256", $prefix);

    mtr_add_arg($args, "%s--open-files-limit=1024", $prefix);

    mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});

  }

mysql-test/t/crash_commit_before-master.opt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
--skip-stack-trace --skip-core-file

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ rpl_sp_effects : BUG#19862 2006-06-15 mkindahl 
#rpl_ndb_idempotent       : BUG#21298 2006-07-27 msvensson

#rpl_row_basic_7ndb       : BUG#21298 2006-07-27 msvensson

#rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson

crash_commit_before      : 2006-08-02 msvensson

rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)

ndb_binlog_discover      : bug#21806 2006-08-24

ndb_autodiscover3        : bug#21806