summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql-bench/crash-me.sh7
-rw-r--r--sql-bench/server-cfg.sh2
2 files changed, 4 insertions, 5 deletions
diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index 27b908be5aa..74226e1ff48 100644
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@PERL@ -w
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
#
# This library is free software; you can redistribute it and/or
@@ -1333,8 +1333,7 @@ report("index in create table",'index_in_create',
# The following must be executed as we need the value of end_drop_keyword
# later
-if (! defined($limits{'create_index'}) &&
- ! defined($limits{'drop_index'}) )
+if (defined($limits{'create_index'}) && defined($limits{'drop_index'}))
{
if ($res=safe_query("create index crash_q on crash_me (a)"))
{
@@ -2659,7 +2658,7 @@ sub safe_query_result
$sth->finish;
return ($result_type == 8) ? 0 : 1;
}
- if(result_type == 8) {
+ if($result_type == 8) {
$sth->finish;
return 1;
}
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index 6e27e84a08d..8ede6022cfc 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -124,7 +124,7 @@ sub new
$limits{'max_conditions'} = 9999; # (Actually not a limit)
$limits{'max_columns'} = 2000; # Max number of columns in table
# Windows can't handle that many files in one directory
- $limits{'max_tables'} = ($machine =~ "^win") ? 5000 : 65000;
+ $limits{'max_tables'} = (($machine || '') =~ "^win") ? 5000 : 65000;
$limits{'max_text_size'} = 65000; # Max size with default buffers.
$limits{'query_size'} = 1000000; # Max size with default buffers.
$limits{'max_index'} = 16; # Max number of keys