diff options
| author | unknown <monty@tik.mysql.fi> | 2001-03-21 01:02:22 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-03-21 01:02:22 +0200 |
| commit | 6257ee7613836c397bda6c3533ca4a114d60e045 (patch) | |
| tree | 8a311781a9b85fe972ca9c89a0dc75654d3b3250 /sql-bench/bench-init.pl.sh | |
| parent | d1782bea92ebf698cdcf898007f3b015ba502493 (diff) | |
| download | mariadb-git-6257ee7613836c397bda6c3533ca4a114d60e045.tar.gz | |
Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
Docs/manual.texi:
Updated information about SET TRANSACTION ISOLATION LEVEL
configure.in:
Upgraded version number
isam/_dbug.c:
Fixed wrong fprintf
isam/isamchk.c:
Added new error message
myisam/mi_check.c:
Added new error message
mysql-test/mysql-test-run.sh:
Don't wait too long for server start
mysys/mf_keycache.c:
Cleaned up some error messages
scripts/mysqlhotcopy.sh:
Applied patch for --resetmaster --resetslave
sql-bench/bench-init.pl.sh:
Fix for windows
sql/handler.cc:
Added isolation levels and gemini spinlocks
sql/handler.h:
Added isolation levels
sql/item_strfunc.cc:
Cleanup of CONCAT_WS()
sql/lex.h:
Added isolation levels
sql/mysql_priv.h:
Added isolation levels
sql/mysqld.cc:
Added isolation levels
sql/sql_class.cc:
Added isolation levels
Moved variable initialization to different code segments
sql/sql_class.h:
Added isolation levels
sql/sql_lex.h:
Added isolation levels
sql/sql_parse.cc:
Added isolation levels
sql/sql_update.cc:
cleanup
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql-bench/bench-init.pl.sh')
| -rw-r--r-- | sql-bench/bench-init.pl.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh index 165b15a0ede..c316bae1e4d 100644 --- a/sql-bench/bench-init.pl.sh +++ b/sql-bench/bench-init.pl.sh @@ -152,8 +152,9 @@ sub merge_limits { foreach $name (split(",",$cmp)) { - $tmp_server= get_server($name,$opt_host, $opt_database, - $opt_odbc) || die "Unknown SQL server: $name\n"; + $tmp_server= (get_server($name,$opt_host, $opt_database, + $opt_odbc,machine_part()) + || die "Unknown SQL server: $name\n"); $limits=$tmp_server->{'limits'}; %new_limits=(); foreach $limit (keys(%$limits)) @@ -365,11 +366,13 @@ sub print_time sub machine_part { - my ($name); + my ($name,$orig); return $opt_machine if (length($opt_machine)); # Specified by user - $name=machine(); - $name="win9$1" if ($name =~ /win.*9(\d)/i); - $name="NT_$1" if ($name =~ /Windows NT.*(\d+\.\d+)/i); +# Specified by user + $orig=$name=machine(); + $name="win9$1" if ($orig =~ /win.*9(\d)/i); + $name="NT_$1" if ($orig =~ /Windows NT.*(\d+\.\d+)/i); + $name="win2k" if ($orig =~ /Windows 2000/i); $name =~ s/\s+/_/g; # Make the filenames easier to parse $name =~ s/-/_/g; $name =~ s/\//_/g; |