Commit 1d13ed30 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 49859bd6 08ef1062

mysql-test/mysql-test-run.pl

+16 −5
Original line number Diff line number Diff line
@@ -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";