mirror of
https://github.com/MariaDB/server.git
synced 2025-07-23 00:55:06 +00:00
MDEV-772, MDEV-744: Fix test-table-elimination script to work.
This commit is contained in:
@ -22,6 +22,7 @@ benchdir = $(benchdir_root)/sql-bench
|
||||
bench_SCRIPTS = test-ATIS test-connect test-create test-insert \
|
||||
test-big-tables test-select test-wisconsin \
|
||||
test-alter-table test-transactions \
|
||||
test-table-elimination \
|
||||
graph-compare-results \
|
||||
bench-init.pl compare-results run-all-tests \
|
||||
server-cfg crash-me copy-db innotest1 innotest1a \
|
||||
@ -31,6 +32,7 @@ CLEANFILES = $(bench_SCRIPTS)
|
||||
EXTRA_SCRIPTS = test-ATIS.sh test-connect.sh test-create.sh \
|
||||
test-insert.sh test-big-tables.sh test-select.sh \
|
||||
test-alter-table.sh test-wisconsin.sh \
|
||||
test-table-elimination.sh \
|
||||
test-transactions.sh \
|
||||
bench-init.pl.sh compare-results.sh server-cfg.sh \
|
||||
run-all-tests.sh crash-me.sh copy-db.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");
|
||||
}
|
||||
|
||||
####
|
||||
|
Reference in New Issue
Block a user