Commit 1d13ed30 authored by unknown's avatar unknown

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
...@@ -1959,11 +1959,22 @@ sub ndbcluster_start_install ($) { ...@@ -1959,11 +1959,22 @@ sub ndbcluster_start_install ($) {
if (!$opt_bench) if (!$opt_bench)
{ {
# Use a smaller configuration # Use a smaller configuration
$ndb_no_ord=32; if ( $mysql_version_id < 50000 )
$ndb_con_op=5000; {
$ndb_dmem="20M"; # 4.1 is using a "larger" --small configuration
$ndb_imem="1M"; $ndb_no_ord=128;
$ndb_pbmem="4M"; $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_template= "ndb/ndb_config_${nodes}_node.ini";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment