diff options
Diffstat (limited to 'sql-bench')
| -rw-r--r-- | sql-bench/bench-init.pl.sh | 2 | ||||
| -rw-r--r-- | sql-bench/server-cfg.sh | 1 | ||||
| -rw-r--r-- | sql-bench/test-alter-table.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-select.sh | 5 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh index b7d2b962e13..b02f5034637 100644 --- a/sql-bench/bench-init.pl.sh +++ b/sql-bench/bench-init.pl.sh @@ -31,7 +31,7 @@ # $server Object for current server # $limits Hash reference to limits for benchmark -$benchmark_version="2.14"; +$benchmark_version="2.15"; use Getopt::Long; require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n"; diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index 55371431152..905e7ee65be 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -2862,7 +2862,6 @@ sub new $limits{'working_blobs'} = 1; # If big varchar/blobs works $limits{'order_by_unused'} = 0; $limits{'working_all_fields'} = 1; - $limits{'multi_distinct'} = 1; # allows select count(distinct a),count(distinct b).. return $self; } diff --git a/sql-bench/test-alter-table.sh b/sql-bench/test-alter-table.sh index f338792e9ef..93a9c1b444e 100644 --- a/sql-bench/test-alter-table.sh +++ b/sql-bench/test-alter-table.sh @@ -24,7 +24,7 @@ use DBI; use Benchmark; $opt_start_field_count=8; # start with this many fields -$opt_loop_count=20; # How many tests to do +$opt_loop_count=100; # How many tests to do $opt_row_count=1000; # Rows in the table $opt_field_count=1000; # Add until this many fields. $opt_time_limit=10*60; # Don't wait more than 10 min for some tests diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh index a5de042cab1..8981fa49cff 100644 --- a/sql-bench/test-select.sh +++ b/sql-bench/test-select.sh @@ -356,7 +356,8 @@ if ($limits->{'group_distinct_functions'}) timestr(timediff($end_time, $loop_time),"all") . "\n"; # Workaround mimer's behavior - if (limits->{'multi_distinct'} == 1 ) { + if ($limits->{'multi_distinct'}) + { $loop_time=new Benchmark; $rows=$estimated=$count=0; for ($i=0 ; $i < $opt_medium_loop_count ; $i++) @@ -370,7 +371,7 @@ if ($limits->{'group_distinct_functions'}) print_time($estimated); print " for count_distinct_2 ($count:$rows): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; - } + } $loop_time=new Benchmark; $rows=$estimated=$count=0; |