summaryrefslogtreecommitdiff
path: root/sql-bench/server-cfg.sh
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-12-03 18:13:06 +0200
committerunknown <monty@mysql.com>2005-12-03 18:13:06 +0200
commitbca61bcfde103f2e8bf7b20c436951f3b81a019b (patch)
tree7d83502e62b0ccab70f41f80ee016652ae9f920a /sql-bench/server-cfg.sh
parent97bfd41fe1382ff33a9fc458c0bd092342b217e5 (diff)
downloadmariadb-git-bca61bcfde103f2e8bf7b20c436951f3b81a019b.tar.gz
Set thread_stack after return from end_thread()
Fixes core dump when reusing thread when running debug binary sql-bench/bench-init.pl.sh: Use ENGINE= instead of TYPE= sql-bench/server-cfg.sh: Use ENGINE= instead of TYPE= sql/mysqld.cc: Set thread_stack (to avoid core dump in store_globlas) sql/sql_parse.cc: Set thread_stack after return from end_thread()
Diffstat (limited to 'sql-bench/server-cfg.sh')
-rw-r--r--sql-bench/server-cfg.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index b0c40102a6b..75528b24b77 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -174,29 +174,29 @@ sub new
# Some fixes that depends on the environment
if (defined($main::opt_create_options) &&
- $main::opt_create_options =~ /type=heap/i)
+ $main::opt_create_options =~ /engine=heap/i)
{
$limits{'working_blobs'} = 0; # HEAP tables can't handle BLOB's
}
if (defined($main::opt_create_options) &&
- $main::opt_create_options =~ /type=innodb/i)
+ $main::opt_create_options =~ /engine=innodb/i)
{
$self->{'transactions'} = 1; # Transactions enabled
}
if (defined($main::opt_create_options) &&
- $main::opt_create_options =~ /type=ndb/i)
+ $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
}
if (defined($main::opt_create_options) &&
- $main::opt_create_options =~ /type=bdb/i)
+ $main::opt_create_options =~ /engine=bdb/i)
{
$self->{'transactions'} = 1; # Transactions enabled
}
if (defined($main::opt_create_options) &&
- $main::opt_create_options =~ /type=gemini/i)
+ $main::opt_create_options =~ /engine=gemini/i)
{
$limits{'working_blobs'} = 0; # Blobs not implemented yet
$limits{'max_tables'} = 500;