Commit e2278398 authored by unknown's avatar unknown

Perl cleanups in sql-bench.

Thanks to Chris Richmond MD6-FDC <crichmon@pcocd2.intel.com> for the
patch.


sql-bench/crash-me.sh:
  fix bug with $limits{create_index} handling.
  fix typo (result_type -> $result_type).
sql-bench/server-cfg.sh:
  fix uninitialized variable warning.
parent 59cf3241
#!@PERL@ #!@PERL@ -w
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB # Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
...@@ -1333,8 +1333,7 @@ report("index in create table",'index_in_create', ...@@ -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 # The following must be executed as we need the value of end_drop_keyword
# later # later
if (! defined($limits{'create_index'}) && if (defined($limits{'create_index'}) && defined($limits{'drop_index'}))
! defined($limits{'drop_index'}) )
{ {
if ($res=safe_query("create index crash_q on crash_me (a)")) if ($res=safe_query("create index crash_q on crash_me (a)"))
{ {
...@@ -2659,7 +2658,7 @@ sub safe_query_result ...@@ -2659,7 +2658,7 @@ sub safe_query_result
$sth->finish; $sth->finish;
return ($result_type == 8) ? 0 : 1; return ($result_type == 8) ? 0 : 1;
} }
if(result_type == 8) { if($result_type == 8) {
$sth->finish; $sth->finish;
return 1; return 1;
} }
......
...@@ -124,7 +124,7 @@ sub new ...@@ -124,7 +124,7 @@ sub new
$limits{'max_conditions'} = 9999; # (Actually not a limit) $limits{'max_conditions'} = 9999; # (Actually not a limit)
$limits{'max_columns'} = 2000; # Max number of columns in table $limits{'max_columns'} = 2000; # Max number of columns in table
# Windows can't handle that many files in one directory # 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{'max_text_size'} = 65000; # Max size with default buffers.
$limits{'query_size'} = 1000000; # Max size with default buffers. $limits{'query_size'} = 1000000; # Max size with default buffers.
$limits{'max_index'} = 16; # Max number of keys $limits{'max_index'} = 16; # Max number of keys
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment