Commit 0a7a2b8f authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents 47b1c7f9 4da54b47

mysql-test/lib/mtr_cases.pl

+1 −0
Original line number Diff line number Diff line
@@ -565,6 +565,7 @@ our @tags= 
 ["include/have_innodb.inc", "innodb_test", 1],

 ["include/have_binlog_format_row.inc", "binlog_format", "row"],

 ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"],

 ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],

 ["include/big_test.inc", "big_test", 1],

 ["include/have_debug.inc", "need_debug", 1],

 ["include/have_ndb.inc", "ndb_test", 1],

mysql-test/mysql-test-run.pl

+8 −0
Original line number Diff line number Diff line
@@ -714,12 +714,20 @@ sub command_line_setup () { 
  # --------------------------------------------------------------------------

  # NOTE if the default binlog format is changed, this has to be changed

  $used_binlog_format= "stmt";

  if ( $mysql_version_id >= 50100 )

  {

    $used_binlog_format= "mixed";

  }

  foreach my $arg ( @opt_extra_mysqld_opt )

  {

    if ( defined mtr_match_substring($arg,"binlog-format=row"))

    {

      $used_binlog_format= "row";

    }

    elsif ( defined mtr_match_substring($arg,"binlog-format=stmt"))

    {

      $used_binlog_format= "stmt";

    }

  }

  mtr_report("Using binlog format '$used_binlog_format'");