diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /sql-bench | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'sql-bench')
| -rw-r--r-- | sql-bench/compare-results.sh | 2 | ||||
| -rw-r--r-- | sql-bench/server-cfg.sh | 11 | ||||
| -rwxr-xr-x | sql-bench/test-table-elimination.sh | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/sql-bench/compare-results.sh b/sql-bench/compare-results.sh index fec65497c57..fe3563bd0b9 100644 --- a/sql-bench/compare-results.sh +++ b/sql-bench/compare-results.sh @@ -512,7 +512,7 @@ sub print_value else { $first=1 if ($first == 0); # Assume that it took one second instead of 0 - $tmp= sprintf("%.2f",$value/$first); + $tmp= sprintf("%.3f",$value/$first); } if (defined($flags)) { diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index 76334d76108..de92fd80a40 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -179,12 +179,23 @@ sub new { $limits{'working_blobs'} = 0; # HEAP tables can't handle BLOB's } + # HEAP is deprecated in favor of MEMORY + if (defined($main::opt_create_options) && + $main::opt_create_options =~ /engine=memory/i) + { + $limits{'working_blobs'} = 0; # MEMORY tables can't handle BLOB's + } if (defined($main::opt_create_options) && $main::opt_create_options =~ /engine=innodb/i) { $self->{'transactions'} = 1; # Transactions enabled } if (defined($main::opt_create_options) && + $main::opt_create_options =~ /engine=pbxt/i) + { + $self->{'transactions'} = 1; # Transactions enabled + } + if (defined($main::opt_create_options) && $main::opt_create_options =~ /engine=ndb/i) { $self->{'transactions'} = 1; # Transactions enabled diff --git a/sql-bench/test-table-elimination.sh b/sql-bench/test-table-elimination.sh index 338a7ceb4b5..0dcfe975486 100755 --- a/sql-bench/test-table-elimination.sh +++ b/sql-bench/test-table-elimination.sh @@ -1,3 +1,4 @@ + #!@PERL@ # Test of table elimination feature |