summaryrefslogtreecommitdiff
path: root/sql-bench/test-select.sh
diff options
context:
space:
mode:
authorunknown <walrus@mysql.com>2003-01-25 17:03:00 +0500
committerunknown <walrus@mysql.com>2003-01-25 17:03:00 +0500
commite1eb5d7c3c5723c4054d01e6c5e1ae6cc778db4f (patch)
tree413f8a55b201d22232d8089baecb78eb58d17f71 /sql-bench/test-select.sh
parentf9e1f8e2dc0b04d656eaaa3f61120ee5a0d16ec7 (diff)
downloadmariadb-git-e1eb5d7c3c5723c4054d01e6c5e1ae6cc778db4f.tar.gz
Change bench files for mimer compability, change crash-me for correct testing time datafields
sql-bench/crash-me.sh: rectify mimer section sql-bench/server-cfg.sh: - Add parameter time_format_inresult - add parameters time_format_ISO, time_format_EUR, time_format_USA, time_format_HHMMSS, time_format_HHHHMMSS - changed sub version() for mysql in the server-cfg, that version shows if client connects with SSL - made --verbose by default - paramters func_extra_time_to_sec, ..sec_to_time, ..addtime, ..subtime, ..timediff, ..maketime, ..time, func_odbc_hour, ..hour_time, ...minute, ...second now uses time formats, that understandable for DBMS sql-bench/test-insert.sh: some changes for mimer compability sql-bench/test-select.sh: some changes for mimer compability
Diffstat (limited to 'sql-bench/test-select.sh')
-rw-r--r--sql-bench/test-select.sh27
1 files changed, 15 insertions, 12 deletions
diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh
index a5ae1da7283..a5de042cab1 100644
--- a/sql-bench/test-select.sh
+++ b/sql-bench/test-select.sh
@@ -355,19 +355,22 @@ if ($limits->{'group_distinct_functions'})
print " for count_distinct ($count:$rows): " .
timestr(timediff($end_time, $loop_time),"all") . "\n";
- $loop_time=new Benchmark;
- $rows=$estimated=$count=0;
- for ($i=0 ; $i < $opt_medium_loop_count ; $i++)
- {
- $count++;
- $rows+=fetch_all_rows($dbh,"select count(distinct grp),count(distinct rev_idn) from bench1");
- $end_time=new Benchmark;
- last if ($estimated=predict_query_time($loop_time,$end_time,\$count,$i+1,
+# Workaround mimer's behavior
+ if (limits->{'multi_distinct'} == 1 ) {
+ $loop_time=new Benchmark;
+ $rows=$estimated=$count=0;
+ for ($i=0 ; $i < $opt_medium_loop_count ; $i++)
+ {
+ $count++;
+ $rows+=fetch_all_rows($dbh,"select count(distinct grp),count(distinct rev_idn) from bench1");
+ $end_time=new Benchmark;
+ last if ($estimated=predict_query_time($loop_time,$end_time,\$count,$i+1,
$opt_medium_loop_count));
- }
- print_time($estimated);
- print " for count_distinct_2 ($count:$rows): " .
- timestr(timediff($end_time, $loop_time),"all") . "\n";
+ }
+ 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;