Commit a1b7f827 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_utils.result:
  SCCS merged
parents ec061718 679a13fe

mysql-test/mysql-test-run.pl

+21 −7
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ sub check_ssl_support ($) { 
sub check_debug_support ($) {

  my $mysqld_variables= shift;



  if ( $mysqld_variables->{'debug'} )

  if ( ! $mysqld_variables->{'debug'} )

  {

    #mtr_report("Binaries are not debug compiled");

    $debug_compiled_binaries= 0;
@@ -1959,12 +1959,23 @@ sub ndbcluster_start_install ($) { 
  if (!$opt_bench)

  {

    # Use a smaller configuration

    if (  $mysql_version_id < 50000 )

    {

      # 4.1 is using a "larger" --small configuration

      $ndb_no_ord=128;

      $ndb_con_op=10000;

      $ndb_dmem="40M";

      $ndb_imem="12M";

    }

    else

    {

      $ndb_no_ord=32;

      $ndb_con_op=5000;

      $ndb_dmem="20M";

      $ndb_imem="1M";

      $ndb_pbmem="4M";

    }

  }



  my $config_file_template=     "ndb/ndb_config_${nodes}_node.ini";

  my $config_file= "$cluster->{'data_dir'}/config.ini";
@@ -2541,7 +2552,10 @@ skip-innodb 
skip-ndbcluster

EOF

;



    if ( $mysql_version_id < 50100 )

    {

      print OUT "skip-bdb\n";

    }

    print OUT "nonguarded\n" if $instance->{'nonguarded'};

    if ( $mysql_version_id >= 50100 )

    {

mysql-test/r/im_utils.result

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ server_id VALUE 
skip-stack-trace	VALUE

skip-innodb	VALUE

skip-ndbcluster	VALUE

skip-bdb	VALUE

log-output	VALUE

SHOW INSTANCE OPTIONS mysqld2;

option_name	value
@@ -40,6 +41,7 @@ server_id VALUE 
skip-stack-trace	VALUE

skip-innodb	VALUE

skip-ndbcluster	VALUE

skip-bdb	VALUE

nonguarded	VALUE

log-output	VALUE

START INSTANCE mysqld2;