summaryrefslogtreecommitdiff
path: root/sql-bench
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-11-22 10:19:31 +0100
committerSergei Golubchik <sergii@pisem.net>2012-11-22 10:19:31 +0100
commita48a91d90f07798deebe514d9d827fb719da7294 (patch)
treec438c045be1f3d8167b3746aa3ac87f848902aeb /sql-bench
parent3a1fdc9e7fc65e29320b988f9a69c8acab168ff9 (diff)
parent13ba0dd286f3296bfbbd202fa76d47770734b472 (diff)
downloadmariadb-git-a48a91d90f07798deebe514d9d827fb719da7294.tar.gz
5.3->5.5 merge
Diffstat (limited to 'sql-bench')
-rwxr-xr-xsql-bench/test-table-elimination.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql-bench/test-table-elimination.sh b/sql-bench/test-table-elimination.sh
index 0dcfe975486..5b494688bec 100755
--- a/sql-bench/test-table-elimination.sh
+++ b/sql-bench/test-table-elimination.sh
@@ -1,4 +1,3 @@
-
#!@PERL@
# Test of table elimination feature
@@ -93,7 +92,7 @@ $dbh->do("create view elim_current_facts as $select_current_full_facts");
if ($opt_lock_tables)
{
- do_query($dbh,"LOCK TABLES elim_facts, elim_attr1, elim_attr2 WRITE");
+ do_query($dbh,"LOCK TABLES elim_current_facts WRITE, elim_facts WRITE, elim_attr1 WRITE, elim_attr2 WRITE");
}
if ($opt_fast && defined($server->{vacuum}))
@@ -200,12 +199,14 @@ if ($opt_lock_tables)
if ($opt_fast && defined($server->{vacuum}))
{
- $server->vacuum(0,\$dbh,["elim_facts", "elim_attr1", "elim_attr2"]);
+ $server->vacuum(1,\$dbh,"elim_facts");
+ $server->vacuum(1,\$dbh,"elim_attr1");
+ $server->vacuum(1,\$dbh,"elim_attr2");
}
if ($opt_lock_tables)
{
- do_query($dbh,"LOCK TABLES elim_facts, elim_attr1, elim_attr2 WRITE");
+ do_query($dbh,"LOCK TABLES elim_current_facts READ, elim_facts READ, elim_attr1 READ, elim_attr2 READ");
}
####