summaryrefslogtreecommitdiff
path: root/sql-bench/test-select.sh
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-11-24 01:51:18 +0200
committermonty@donna.mysql.com <>2000-11-24 01:51:18 +0200
commit81bc313e99ed12ff87ca45529a11ab31acc28263 (patch)
treef7a94e9f7992838a96724db08a38f94bd9d50e27 /sql-bench/test-select.sh
parentc62554025dad1f70cf5335233864b390cf5de95e (diff)
downloadmariadb-git-81bc313e99ed12ff87ca45529a11ab31acc28263.tar.gz
All statements are now run in a sub transaction
Give warning if we are using non transactional tables and do ROLLBACK Porting of crash-me and benchmarks to FrontBase
Diffstat (limited to 'sql-bench/test-select.sh')
-rwxr-xr-xsql-bench/test-select.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh
index ef76c027380..e75ee26fff8 100755
--- a/sql-bench/test-select.sh
+++ b/sql-bench/test-select.sh
@@ -61,7 +61,7 @@ $start_time=new Benchmark;
goto select_test if ($opt_skip_create);
print "Creating table\n";
-$dbh->do("drop table bench1");
+$dbh->do("drop table bench1" . $server->{'drop_attr'});
do_many($dbh,$server->create("bench1",
["region char(1) NOT NULL",
@@ -213,7 +213,7 @@ print " for select_range ($count:$rows): " .
# Testing MIN() and MAX() on keys
#
-if ($limits->{'group_functions'})
+if ($limits->{'group_functions'} && $limits->{'order_by_unused'})
{
$loop_time=new Benchmark;
$count=0;
@@ -230,6 +230,7 @@ if ($limits->{'group_functions'})
fetch_all_rows($dbh,"select min(region),max(region) from bench1");
}
fetch_all_rows($dbh,"select min(rev_idn) from bench1 where region='$region'");
+
fetch_all_rows($dbh,"select max(grp) from bench1 where region='$region'");
fetch_all_rows($dbh,"select max(idn) from bench1 where region='$region' and grp=$grp");
if ($limits->{'group_func_sql_min_str'})
@@ -265,6 +266,10 @@ if ($limits->{'group_functions'})
print " for count_on_key ($count): " .
timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+}
+
+if ($limits->{'group_functions'})
+{
$loop_time=new Benchmark;
$rows=0;
for ($i=0 ; $i < $opt_medium_loop_count ; $i++)
@@ -276,7 +281,7 @@ if ($limits->{'group_functions'})
timestr(timediff($end_time, $loop_time),"all") . "\n";
}
-if ($limits->{'group_functions'})
+if ($limits->{'group_distinct_functions'})
{
print "Testing count(distinct) on the table\n";
$loop_time=new Benchmark;
@@ -362,7 +367,7 @@ if ($opt_lock_tables)
}
if (!$opt_skip_delete)
{
- do_query($dbh,"drop table bench1");
+ do_query($dbh,"drop table bench1" . $server->{'drop_attr'});
}
if ($opt_fast && defined($server->{vacuum}))