mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
unknown 2006-10-05 00:37:40 +02:00
commit a1b7f82744
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mysql-test/mysql-test-run.pl
View file

@ -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,11 +1959,22 @@ sub ndbcluster_start_install ($) {
if (!$opt_bench)
{
# Use a smaller configuration
$ndb_no_ord=32;
$ndb_con_op=5000;
$ndb_dmem="20M";
$ndb_imem="1M";
$ndb_pbmem="4M";
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";
@ -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 )
{

2
mysql-test/r/im_utils.result
View file

@ -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;