From a86e11ef153433cf52886692c493e90784e10ee2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 Sep 2003 13:36:01 +0300 Subject: Block SIGPIPE also for not threaded client programs. Added --include and --libs_r options to mysql_config. Added mysql_get_client_version() to client library Fixed some minor benchmark issues acinclude.m4: Fixed that 'no' is printed if openssl not used configure.in: Fixed error message extra/comp_err.c: Skip lines before first { include/mysql.h: Indentation cleanup libmysql/libmysql.c: Block SIGPIPE also for not threaded programs. This is now done once in mysql_server_init() and not for every call to mysql_init(). Added mysql_get_client_version() libmysql/libmysql.def: added mysql_get_client_version scripts/Makefile.am: Add openssl libraries to mysql_config scripts/mysql_config.sh: Added options --include and --libs_r Added C compiler options to 'cflags' scripts/mysql_install_db.sh: Fixed tests with IN_RPM to not give warnings sql-bench/bench-init.pl.sh: Updated version number sql-bench/server-cfg.sh: Remove duplicate line sql-bench/test-alter-table.sh: Increase loops for more relevant test sql-bench/test-select.sh: Fix wrong test for count_distinct_2 tests/mail_to_db.pl: Default db and table for easier usage --- sql-bench/test-select.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sql-bench/test-select.sh') diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh index a5de042cab1..8981fa49cff 100644 --- a/sql-bench/test-select.sh +++ b/sql-bench/test-select.sh @@ -356,7 +356,8 @@ if ($limits->{'group_distinct_functions'}) timestr(timediff($end_time, $loop_time),"all") . "\n"; # Workaround mimer's behavior - if (limits->{'multi_distinct'} == 1 ) { + if ($limits->{'multi_distinct'}) + { $loop_time=new Benchmark; $rows=$estimated=$count=0; for ($i=0 ; $i < $opt_medium_loop_count ; $i++) @@ -370,7 +371,7 @@ if ($limits->{'group_distinct_functions'}) print_time($estimated); print " for count_distinct_2 ($count:$rows): " . timestr(timediff($end_time, $loop_time),"all") . "\n"; - } + } $loop_time=new Benchmark; $rows=$estimated=$count=0; -- cgit v1.2.1 From dd3af2257aa36cc6c7018e123641193d0fdaa722 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 25 Sep 2003 23:12:24 +0200 Subject: - Improved portability of the sql-bench Perl scripts by replacing the calls of external programs "uname" and "pwd" with Perl builtin functions "cwd()" and "POSIX::uname()" sql-bench/as3ap.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/bench-count-distinct.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/bench-init.pl.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. - portability fix: don't call external "uname" in various combinations, use POSIX::uname() instead. sql-bench/copy-db.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/crash-me.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. - portability fix: don't call external "uname" in various combinations, use POSIX::uname() instead. sql-bench/innotest1.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/innotest1a.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/innotest1b.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/innotest2.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/innotest2a.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/innotest2b.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/run-all-tests.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-ATIS.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-alter-table.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-big-tables.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-connect.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-create.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-insert.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-select.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-transactions.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. sql-bench/test-wisconsin.sh: - portability fix: don't call external "pwd" command, use the "cwd()" builtin function instead. --- sql-bench/test-select.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql-bench/test-select.sh') diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh index 8981fa49cff..63f70b0aaa1 100644 --- a/sql-bench/test-select.sh +++ b/sql-bench/test-select.sh @@ -20,6 +20,7 @@ # ##################### Standard benchmark inits ############################## +use Cwd; use DBI; use Getopt::Long; use Benchmark; @@ -30,7 +31,7 @@ $opt_small_loop_count=10; $opt_regions=6; $opt_groups=100; -chomp($pwd = `pwd`); $pwd = "." if ($pwd eq ''); +$pwd = cwd(); $pwd = "." if ($pwd eq ''); require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n"; $columns=min($limits->{'max_columns'},500,($limits->{'query_size'}-50)/24, -- cgit v1.2.1