diff options
Diffstat (limited to 'sql-bench')
| -rw-r--r-- | sql-bench/bench-init.pl.sh | 4 | ||||
| -rw-r--r-- | sql-bench/server-cfg.sh | 13 | ||||
| -rwxr-xr-x | sql-bench/test-table-elimination.sh | 1 |
3 files changed, 8 insertions, 10 deletions
diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh index 9aab11c90cc..1b6509cebcc 100644 --- a/sql-bench/bench-init.pl.sh +++ b/sql-bench/bench-init.pl.sh @@ -265,7 +265,7 @@ sub fetch_all_rows if (!($sth= $dbh->prepare($query))) { print "\n" if ($opt_debug); - die "Error occured with prepare($query)\n -> $DBI::errstr\n"; + die "Error occurred with prepare($query)\n -> $DBI::errstr\n"; return undef; } if (!$sth->execute) @@ -282,7 +282,7 @@ sub fetch_all_rows print "0\n" if ($opt_debug); return 0; } - die "Error occured with execute($query)\n -> $DBI::errstr\n"; + die "Error occurred with execute($query)\n -> $DBI::errstr\n"; $sth->finish; return undef; } diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index 9568efcd189..fcdfe0b678f 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -192,14 +192,6 @@ sub new $self->{'transactions'} = 1; # Transactions enabled } if (defined($main::opt_create_options) && - $main::opt_create_options =~ /engine=ndb/i) - { - $self->{'transactions'} = 1; # Transactions enabled - $limits{'max_columns'} = 90; # Max number of columns in table - $limits{'max_tables'} = 32; # No comments - $limits{'max_temporary_tables'}= $limits{"max_tables"}; - } - if (defined($main::opt_create_options) && $main::opt_create_options =~ /engine=bdb/i) { $self->{'transactions'} = 1; # Transactions enabled @@ -212,6 +204,11 @@ sub new $limits{'max_temporary_tables'}= $limits{"max_tables"}; $self->{'transactions'} = 1; # Transactions enabled } + if (defined($main::opt_create_options) && + $main::opt_create_options =~ /engine=tokudb/i) + { + $self->{'transactions'} = 1; # Transactions enabled + } return $self; } diff --git a/sql-bench/test-table-elimination.sh b/sql-bench/test-table-elimination.sh index 7772cab42b0..de440fc0633 100755 --- a/sql-bench/test-table-elimination.sh +++ b/sql-bench/test-table-elimination.sh @@ -305,6 +305,7 @@ if ($opt_lock_tables) if (!$opt_skip_delete) { do_query($dbh,"drop table elim_facts, elim_attr1, elim_attr2" . $server->{'drop_attr'}); + $dbh->do("drop view elim_current_facts"); } if ($opt_fast && defined($server->{vacuum})) |