Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations

Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"


sql-bench/test-wisconsin.sh:
  Rename: BitKeeper/deleted/.del-test-wisconsin.sh~c0b86821b5f95f26 -> sql-bench/test-wisconsin.sh
sql-bench/test-transactions.sh:
  Rename: BitKeeper/deleted/.del-test-transactions.sh~c1c892f10c40caf -> sql-bench/test-transactions.sh
sql-bench/test-insert.sh:
  Rename: BitKeeper/deleted/.del-test-insert.sh~893bfac9dedb79a7 -> sql-bench/test-insert.sh
sql-bench/test-select.sh:
  Rename: BitKeeper/deleted/.del-test-select.sh~6d5cc770acf11be6 -> sql-bench/test-select.sh
sql-bench/test-create.sh:
  Rename: BitKeeper/deleted/.del-test-create.sh~f9a1ea38c191b17a -> sql-bench/test-create.sh
sql-bench/test-big-tables.sh:
  Rename: BitKeeper/deleted/.del-test-big-tables.sh~5b1b0c5fb623565a -> sql-bench/test-big-tables.sh
sql-bench/test-connect.sh:
  Rename: BitKeeper/deleted/.del-test-connect.sh~382a728c949ee075 -> sql-bench/test-connect.sh
sql-bench/test-ATIS.sh:
  Rename: BitKeeper/deleted/.del-test-ATIS.sh~e8ebff7086c95773 -> sql-bench/test-ATIS.sh
sql-bench/test-alter-table.sh:
  Rename: BitKeeper/deleted/.del-test-alter-table.sh~eba6cfa9972fcced -> sql-bench/test-alter-table.sh
sql-bench/innotest2b.sh:
  Rename: BitKeeper/deleted/.del-innotest2b.sh~7b99ece835e8dff3 -> sql-bench/innotest2b.sh
sql-bench/run-all-tests.sh:
  Rename: BitKeeper/deleted/.del-run-all-tests.sh~41d6da1cf211ee95 -> sql-bench/run-all-tests.sh
sql-bench/innotest2.sh:
  Rename: BitKeeper/deleted/.del-innotest2.sh~9c14df528285603 -> sql-bench/innotest2.sh
sql-bench/innotest2a.sh:
  Rename: BitKeeper/deleted/.del-innotest2a.sh~e01d016a7cafdc0b -> sql-bench/innotest2a.sh
sql-bench/innotest1a.sh:
  Rename: BitKeeper/deleted/.del-innotest1a.sh~c64f4610ae1e26fe -> sql-bench/innotest1a.sh
sql-bench/innotest1b.sh:
  Rename: BitKeeper/deleted/.del-innotest1b.sh~aafd0819ae84da7b -> sql-bench/innotest1b.sh
sql-bench/innotest1.sh:
  Rename: BitKeeper/deleted/.del-innotest1.sh~aa36bce09ca783c7 -> sql-bench/innotest1.sh
sql-bench/crash-me.sh:
  Rename: BitKeeper/deleted/.del-crash-me.sh~2fa881d0b40339c8 -> sql-bench/crash-me.sh
sql-bench/graph-compare-results.sh:
  Rename: BitKeeper/deleted/.del-graph-compare-results.sh~7e4e28b3591b4542 -> sql-bench/graph-compare-results.sh
sql-bench/copy-db.sh:
  Rename: BitKeeper/deleted/.del-copy-db.sh~e8116afb93144ccd -> sql-bench/copy-db.sh
sql-bench/compare-results.sh:
  Rename: BitKeeper/deleted/.del-compare-results.sh~a9e26e2644c694b3 -> sql-bench/compare-results.sh
sql-bench/bench-count-distinct.sh:
  Rename: BitKeeper/deleted/.del-bench-count-distinct.sh~a92f174271a831d7 -> sql-bench/bench-count-distinct.sh
sql-bench/as3ap.sh:
  Rename: BitKeeper/deleted/.del-as3ap.sh~f54eebbd8d34c9b6 -> sql-bench/as3ap.sh
sql-bench/Comments/Informix.crash-me:
  Rename: BitKeeper/deleted/.del-Informix.crash-me~51ab5b717cefe74 -> sql-bench/Comments/Informix.crash-me
sql-bench/Comments/postgres.crash-me:
  Rename: BitKeeper/deleted/.del-postgres.crash-me~eacac145c3e30f17 -> sql-bench/Comments/postgres.crash-me
sql-bench/Comments/Empress.crash-me:
  Rename: BitKeeper/deleted/.del-Empress.crash-me~bdaff0c68ce10f02 -> sql-bench/Comments/Empress.crash-me
sql-bench/Comments/Adabas.crash-me:
  Rename: BitKeeper/deleted/.del-Adabas.crash-me~ce88ba1a540971ac -> sql-bench/Comments/Adabas.crash-me
sql-bench/Comments/Access.crash-me:
  Rename: BitKeeper/deleted/.del-Access.crash-me~bb457ec282d939b6 -> sql-bench/Comments/Access.crash-me
sql-bench/Comments/postgres.benchmark:
  Rename: BitKeeper/deleted/.del-postgres.benchmark~4d30890732b784a -> sql-bench/Comments/postgres.benchmark
sql-bench/Comments/mysql.benchmark:
  Rename: BitKeeper/deleted/.del-mysql.benchmark~4d8729c0937456fc -> sql-bench/Comments/mysql.benchmark
sql-bench/Comments/FrontBase.benchmark:
  Rename: BitKeeper/deleted/.del-FrontBase.benchmark~217041ef18274c2e -> sql-bench/Comments/FrontBase.benchmark
sql-bench/Comments/interbase:
  Rename: BitKeeper/deleted/.del-interbase~cdad59622b4d6f3 -> sql-bench/Comments/interbase
sql-bench/uname.bat:
  Rename: BitKeeper/deleted/.del-uname.bat~a6d933d2ee9314c -> sql-bench/uname.bat
sql-bench/pwd.bat:
  Rename: BitKeeper/deleted/.del-pwd.bat~9b64050849abf51 -> sql-bench/pwd.bat
sql-bench/example.bat:
  Rename: BitKeeper/deleted/.del-example.bat~22d0170bccf0f030 -> sql-bench/example.bat
sql-bench/Makefile.am:
  Rename: BitKeeper/deleted/.del-Makefile.am~7b07da85b2e9375 -> sql-bench/Makefile.am
sql-bench/Data/ATIS/transport.txt:
  Rename: BitKeeper/deleted/.del-transport.txt~fa4ca40735f8354c -> sql-bench/Data/ATIS/transport.txt
sql-bench/Data/ATIS/time_zone.txt:
  Rename: BitKeeper/deleted/.del-time_zone.txt~4171f9ca732f65c0 -> sql-bench/Data/ATIS/time_zone.txt
sql-bench/Data/Wisconsin/tenk.data:
  Rename: BitKeeper/deleted/.del-tenk.data~6aeaebdd534e458e -> sql-bench/Data/Wisconsin/tenk.data
sql-bench/Data/Wisconsin/onek.data:
  Rename: BitKeeper/deleted/.del-onek.data~6cd1edaf596a7f7 -> sql-bench/Data/Wisconsin/onek.data
sql-bench/Data/ATIS/stop1.txt:
  Rename: BitKeeper/deleted/.del-stop1.txt~f09ba164ad44a288 -> sql-bench/Data/ATIS/stop1.txt
sql-bench/Data/ATIS/time_interval.txt:
  Rename: BitKeeper/deleted/.del-time_interval.txt~a1def62e267a59b2 -> sql-bench/Data/ATIS/time_interval.txt
sql-bench/Data/ATIS/stop.txt:
  Rename: BitKeeper/deleted/.del-stop.txt~31fb564e1f415e34 -> sql-bench/Data/ATIS/stop.txt
sql-bench/Data/ATIS/restriction.txt:
  Rename: BitKeeper/deleted/.del-restriction.txt~6ae208924617784a -> sql-bench/Data/ATIS/restriction.txt
sql-bench/Data/ATIS/state.txt:
  Rename: BitKeeper/deleted/.del-state.txt~9dd470ce14075b90 -> sql-bench/Data/ATIS/state.txt
sql-bench/Data/ATIS/restrict_class.txt:
  Rename: BitKeeper/deleted/.del-restrict_class.txt~2f741bf0ea498f84 -> sql-bench/Data/ATIS/restrict_class.txt
sql-bench/Data/ATIS/month_name.txt:
  Rename: BitKeeper/deleted/.del-month_name.txt~4c44f7a323d57d92 -> sql-bench/Data/ATIS/month_name.txt
sql-bench/Data/ATIS/restrict_carrier.txt:
  Rename: BitKeeper/deleted/.del-restrict_carrier.txt~925b5492f3f9cba3 -> sql-bench/Data/ATIS/restrict_carrier.txt
sql-bench/Data/ATIS/ground_service.txt:
  Rename: BitKeeper/deleted/.del-ground_service.txt~1087e477e86e84c -> sql-bench/Data/ATIS/ground_service.txt
sql-bench/Data/ATIS/food_service.txt:
  Rename: BitKeeper/deleted/.del-food_service.txt~66d95a150c28458 -> sql-bench/Data/ATIS/food_service.txt
sql-bench/Data/ATIS/flight_day.txt:
  Rename: BitKeeper/deleted/.del-flight_day.txt~76868d6d265d441e -> sql-bench/Data/ATIS/flight_day.txt
sql-bench/Data/ATIS/flight_fare.txt:
  Rename: BitKeeper/deleted/.del-flight_fare.txt~d7322593c8530487 -> sql-bench/Data/ATIS/flight_fare.txt
sql-bench/Data/ATIS/flight_class.txt:
  Rename: BitKeeper/deleted/.del-flight_class.txt~1801101474c29098 -> sql-bench/Data/ATIS/flight_class.txt
sql-bench/Data/ATIS/fconnection.txt:
  Rename: BitKeeper/deleted/.del-fconnection.txt~e0ef6a8b5560a713 -> sql-bench/Data/ATIS/fconnection.txt
sql-bench/Data/ATIS/flight.txt:
  Rename: BitKeeper/deleted/.del-flight.txt~e5065423760e99eb -> sql-bench/Data/ATIS/flight.txt
sql-bench/Data/ATIS/fare.txt:
  Rename: BitKeeper/deleted/.del-fare.txt~ea0652f490bc24a6 -> sql-bench/Data/ATIS/fare.txt
sql-bench/Data/ATIS/day_name.txt:
  Rename: BitKeeper/deleted/.del-day_name.txt~f813b215955d894c -> sql-bench/Data/ATIS/day_name.txt
sql-bench/Data/ATIS/dual_carrier.txt:
  Rename: BitKeeper/deleted/.del-dual_carrier.txt~a7dd776224fbd92b -> sql-bench/Data/ATIS/dual_carrier.txt
sql-bench/Data/ATIS/date_day.txt:
  Rename: BitKeeper/deleted/.del-date_day.txt~4e9a282fcf54cfd8 -> sql-bench/Data/ATIS/date_day.txt
sql-bench/Data/ATIS/compound_class.txt:
  Rename: BitKeeper/deleted/.del-compound_class.txt~d4a2f1b7f96340b9 -> sql-bench/Data/ATIS/compound_class.txt
sql-bench/Data/ATIS/connect_leg.txt:
  Rename: BitKeeper/deleted/.del-connect_leg.txt~f97b6e94e108bb36 -> sql-bench/Data/ATIS/connect_leg.txt
sql-bench/Data/ATIS/code_description.txt:
  Rename: BitKeeper/deleted/.del-code_description.txt~f9117373e438b0e2 -> sql-bench/Data/ATIS/code_description.txt
sql-bench/Data/ATIS/city.txt:
  Rename: BitKeeper/deleted/.del-city.txt~d96dd6d073344d2e -> sql-bench/Data/ATIS/city.txt
sql-bench/Data/ATIS/class_of_service.txt:
  Rename: BitKeeper/deleted/.del-class_of_service.txt~21f6b9848b8c76d -> sql-bench/Data/ATIS/class_of_service.txt
sql-bench/Data/ATIS/airport_service.txt:
  Rename: BitKeeper/deleted/.del-airport_service.txt~6ee6d5b852b3e38 -> sql-bench/Data/ATIS/airport_service.txt
sql-bench/Data/ATIS/airline.txt:
  Rename: BitKeeper/deleted/.del-airline.txt~a79f8eadf853f2c8 -> sql-bench/Data/ATIS/airline.txt
sql-bench/Data/ATIS/airport.txt:
  Rename: BitKeeper/deleted/.del-airport.txt~59c78514130e1f45 -> sql-bench/Data/ATIS/airport.txt
sql-bench/Data/ATIS/aircraft.txt:
  Rename: BitKeeper/deleted/.del-aircraft.txt~15e4de7ab37c92d3 -> sql-bench/Data/ATIS/aircraft.txt
sql-bench/TODO:
  Rename: BitKeeper/deleted/.del-TODO~cac6d7a63c426ae5 -> sql-bench/TODO
sql-bench/limits/sybase.cfg:
  Rename: BitKeeper/deleted/.del-sybase.cfg~c4636b12767b3f14 -> sql-bench/limits/sybase.cfg
sql-bench/limits/solid-nt4.cfg:
  Rename: BitKeeper/deleted/.del-solid-nt4.cfg~cca779f0c9e29d31 -> sql-bench/limits/solid-nt4.cfg
sql-bench/limits/solid.cfg:
  Rename: BitKeeper/deleted/.del-solid.cfg~5ae0e4342eadb0fb -> sql-bench/limits/solid.cfg
sql-bench/limits/pg.cfg:
  Rename: BitKeeper/deleted/.del-pg.cfg~db59cf39a5d417be -> sql-bench/limits/pg.cfg
sql-bench/limits/mysql.cfg:
  Rename: BitKeeper/deleted/.del-mysql.cfg~9cab20a8771b93cf -> sql-bench/limits/mysql.cfg
sql-bench/limits/oracle.cfg:
  Rename: BitKeeper/deleted/.del-oracle.cfg~affab21af8f438fd -> sql-bench/limits/oracle.cfg
sql-bench/limits/mysql-4.1.cfg:
  Rename: BitKeeper/deleted/.del-mysql-4.1.cfg~b6c5e74aefc99e3c -> sql-bench/limits/mysql-4.1.cfg
sql-bench/limits/mysql-3.23.cfg:
  Rename: BitKeeper/deleted/.del-mysql-3.23.cfg~3cf9d6be54b77a3c -> sql-bench/limits/mysql-3.23.cfg
sql-bench/limits/mysql-4.0.cfg:
  Rename: BitKeeper/deleted/.del-mysql-4.0.cfg~6c9d63c85b5ef574 -> sql-bench/limits/mysql-4.0.cfg
sql-bench/limits/mysql-3.22.cfg:
  Rename: BitKeeper/deleted/.del-mysql-3.22.cfg~e706f26a161175cd -> sql-bench/limits/mysql-3.22.cfg
sql-bench/limits/msql.cfg:
  Rename: BitKeeper/deleted/.del-msql.cfg~52710b12932cceb9 -> sql-bench/limits/msql.cfg
sql-bench/limits/ms-sql65.cfg:
  Rename: BitKeeper/deleted/.del-ms-sql65.cfg~6b9bc3c460dbee05 -> sql-bench/limits/ms-sql65.cfg
sql-bench/limits/mimer.cfg:
  Rename: BitKeeper/deleted/.del-mimer.cfg~234e6c1c3c47b612 -> sql-bench/limits/mimer.cfg
sql-bench/limits/ms-sql.cfg:
  Rename: BitKeeper/deleted/.del-ms-sql.cfg~1907964264d2786a -> sql-bench/limits/ms-sql.cfg
sql-bench/limits/interbase.cfg:
  Rename: BitKeeper/deleted/.del-interbase.cfg~c6951a0376cc6ff3 -> sql-bench/limits/interbase.cfg
sql-bench/limits/interbase-dialect3.cfg:
  Rename: BitKeeper/deleted/.del-interbase-dialect3.cfg~46277bdfc74c667a -> sql-bench/limits/interbase-dialect3.cfg
sql-bench/limits/interbase-superserver.cfg:
  Rename: BitKeeper/deleted/.del-interbase-superserver.cfg~22501198689243b0 -> sql-bench/limits/interbase-superserver.cfg
sql-bench/limits/interbase-dialect1.cfg:
  Rename: BitKeeper/deleted/.del-interbase-dialect1.cfg~659206b5b9a11036 -> sql-bench/limits/interbase-dialect1.cfg
sql-bench/limits/empress.cfg:
  Rename: BitKeeper/deleted/.del-empress.cfg~1f97f34d6560a499 -> sql-bench/limits/empress.cfg
sql-bench/limits/frontbase.cfg:
  Rename: BitKeeper/deleted/.del-frontbase.cfg~71369e9c002696e -> sql-bench/limits/frontbase.cfg
sql-bench/limits/db2.cfg:
  Rename: BitKeeper/deleted/.del-db2.cfg~711099b4d7906959 -> sql-bench/limits/db2.cfg
sql-bench/limits/access.cfg:
  Rename: BitKeeper/deleted/.del-access.cfg~5239ea3655b7bba0 -> sql-bench/limits/access.cfg
sql-bench/limits/access_odbc.cfg:
  Rename: BitKeeper/deleted/.del-access_odbc.cfg~34b4cf0eda56c4b1 -> sql-bench/limits/access_odbc.cfg
sql-bench/limits/Informix.cfg:
  Rename: BitKeeper/deleted/.del-Informix.cfg~b94188e1ececb51b -> sql-bench/limits/Informix.cfg
sql-bench/limits/Adabas.cfg:
  Rename: BitKeeper/deleted/.del-Adabas.cfg~343ed4e7f8b02111 -> sql-bench/limits/Adabas.cfg
sql-bench/README:
  Rename: BitKeeper/deleted/.del-README~b1aa0c1bf9f5eb5e -> sql-bench/README
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed:
  Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed
Makefile.am:
  Added back sql-bench
configure.in:
  Added back sql-bench
dbug/dbug.c:
  Fixed memory leak in _db_set()
  This is not a complete fix as we can still get memory leaks if we do any of the following:
  mysqld --debug --debug
  CAll DBUG_SET or DBUG_SET_INITIAL more than once in a program
  Use SET @@global.debug=xxxx
  
  At some point we should fix the above, but this is not critical for normal operation (only for debugging)
  
  Bug #24497 Valgrind warning: get_one_option
  
  Note that all changes to _db_set_ is only a variable access change, and can be ignored while reviewing the bug fix.
mysql-test/t/flush_read_lock_kill-master.opt:
  Added '+' to option, to be able to use this together with --debug
mysql-test/valgrind.supp:
  Removed warning that is now fixed
mysys/ptr_cmp.c:
  Fixed wrong pointer read (probably never used)
scripts/make_binary_distribution.sh:
  Added back sql_bench
sql/field.h:
  Removed class function that was identical in parent class
sql/mysqld.cc:
  Removed some calls to my_thread_init() / my_thread_end() that was not needed.
  Only call DBUG_SET_INITAL, not DBUG_SET
  (Fixes memory leak in dbug)
  Mark some code as deadcode
sql/net_serv.cc:
  Add information about from where error comes
sql-bench/bench-init.pl.sh:
  Cleaned up help text
sql-bench/server-cfg.sh:
  Don't write '/' after server name of no ssl version
sql-common/client.c:
  Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
  BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
sql/sql_parse.cc:
  Added comment
sql/table.h:
  Removed compiler warning

1 files changed, 331 insertions, 0 deletions

diff --git a/sql-bench/test-connect.sh b/sql-bench/test-connect.sh
new file mode 100644
index 00000000000..b7a360cac38
--- /dev/null
+++ b/sql-bench/test-connect.sh
@@ -0,0 +1,331 @@
+#!@PERL@
+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
+#
+# This test is for testing the speed of connections and sending
+# data to the client.
+#
+# By changing the variable '$opt_loop_count' value you can make this test
+# easier/harderto your computer to execute. You can also change this value
+# by using option --loop_value='what_ever_you_like'.
+##################### Standard benchmark inits ##############################
+
+use Cwd;
+use DBI;
+use Benchmark;
+
+$opt_loop_count=100000;	# Change this to make test harder/easier
+$str_length=65000;	# This is the length of blob strings in PART:5
+$max_test=20;		# How many times to test if the server is busy
+
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+# This is the length of blob strings in PART:5
+$str_length=min($limits->{'max_text_size'},$limits->{'query_size'}-30,$str_length);
+
+if ($opt_small_test)
+{
+  $opt_loop_count/=100;
+}
+
+$opt_loop_count=min(1000, $opt_loop_count) if ($opt_tcpip);
+$small_loop_count=$opt_loop_count/10; # For connect tests
+
+print "Testing the speed of connecting to the server and sending of data\n";
+print "Connect tests are done $small_loop_count times and other tests $opt_loop_count times\n\n";
+
+################################# PART:1 ###################################
+####
+####  Start timeing and start connect test..
+####
+
+$start_time=new Benchmark;
+
+print "Testing connection/disconnect\n";
+
+$loop_time=new Benchmark;
+$errors=0;
+
+for ($i=0 ; $i < $small_loop_count ; $i++)
+{
+  print "$i " if (($opt_debug));
+  for ($j=0; $j < $max_test ; $j++)
+  {
+    if ($dbh = DBI->connect($server->{'data_source'}, $opt_user,
+			    $opt_password))
+    {
+      $dbh->disconnect;
+      last;
+    }
+    select(undef, undef, undef, 0.01*$j);
+    print "$errors " if (($opt_debug));
+    $errors++;
+  }
+  die "Got error '$DBI::errstr' after $i connects" if ($j == $max_test);
+  $dbh->disconnect;
+  undef($dbh);
+}
+$end_time=new Benchmark;
+print "Warning: $errors connections didn't work without a time delay\n" if ($errors);
+print "Time to connect ($small_loop_count): " .
+  timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+
+################################# PART:2 ###################################
+#### Now we shall do first one connect, then simple select
+#### (select 1..) and then close connection. This will be
+#### done $small_loop_count times.
+
+if ($limits->{'select_without_from'})
+{
+  print "Test connect/simple select/disconnect\n";
+  $loop_time=new Benchmark;
+
+  for ($i=0; $i < $small_loop_count; $i++)
+  {
+    $dbh = DBI->connect($server->{'data_source'}, $opt_user, $opt_password) || die $DBI::errstr;
+    $sth = $dbh->do("select $i") or die $DBI::errstr;
+    $dbh->disconnect;
+  }
+  $end_time=new Benchmark;
+  print "Time for connect+select_simple ($small_loop_count): " .
+    timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+}
+
+################################# PART:3 ###################################
+####
+#### Okay..Next thing we'll do is a simple select $opt_loop_count times.
+####
+
+$dbh = DBI->connect($server->{'data_source'}, $opt_user, $opt_password,
+		    { PrintError => 0}) || die $DBI::errstr;
+
+if ($limits->{'select_without_from'})
+{
+  print "Test simple select\n";
+  $loop_time=new Benchmark;
+  for ($i=0 ; $i < $opt_loop_count ; $i++)
+  {
+    $sth = $dbh->do("select $i") or die $DBI::errstr;
+  }
+  $end_time=new Benchmark;
+  print "Time for select_simple ($opt_loop_count): " .
+    timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+}
+
+###########################################################################
+#### The same as the previous test, but always execute the same select
+#### This is done to test the query cache for real simple selects.
+
+if ($limits->{'select_without_from'})
+{
+  print "Test simple select\n";
+  $loop_time=new Benchmark;
+  for ($i=0 ; $i < $opt_loop_count ; $i++)
+  {
+    $sth = $dbh->do("select 10000") or die $DBI::errstr;
+  }
+  $end_time=new Benchmark;
+  print "Time for select_simple_cache ($opt_loop_count): " .
+    timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+}
+
+##########################################################################
+#### First, we'll create a simple table 'bench1'
+#### Then we shall do $opt_loop_count selects from this table.
+#### Table will contain very simple data.
+
+$sth = $dbh->do("drop table bench1" . $server->{'drop_attr'});
+do_many($dbh,$server->create("bench1",
+			     ["a int NOT NULL",
+			      "i int",
+			      "s char(10)"],
+			     ["primary key (a)"]));
+$sth = $dbh->do("insert into bench1 values(1,100,'AAA')") or die $DBI::errstr;
+
+if ($opt_fast && defined($server->{vacuum}))
+{
+  $server->vacuum(0,\$dbh);
+}
+$dbh->disconnect;
+
+#
+# First test connect/select/disconnect
+#
+print "Testing connect/select 1 row from table/disconnect\n";
+
+$loop_time=new Benchmark;
+$errors=0;
+
+for ($i=0 ; $i < $small_loop_count ; $i++)
+{
+  for ($j=0; $j < $max_test ; $j++)
+  {
+    last if ($dbh = DBI->connect($server->{'data_source'}, $opt_user, $opt_password));
+    $errors++;
+  }
+  die $DBI::errstr if ($j == $max_test);
+
+  $sth = $dbh->do("select a,i,s,$i from bench1") # Select * from table with 1 record
+    or die $DBI::errstr;
+  $dbh->disconnect;
+}
+
+$end_time=new Benchmark;
+print "Warning: $errors connections didn't work without a time delay\n" if ($errors);
+print "Time to connect+select_1_row ($small_loop_count): " .
+  timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+
+#
+# The same test, but without connect/disconnect
+#
+print "Testing select 1 row from table\n";
+
+$dbh = $server->connect();
+$loop_time=new Benchmark;
+
+for ($i=0 ; $i < $opt_loop_count ; $i++)
+{
+  $sth = $dbh->do("select a,i,s,$i from bench1") # Select * from table with 1 record
+    or die $DBI::errstr;
+}
+
+$end_time=new Benchmark;
+print "Time to select_1_row ($opt_loop_count): " .
+  timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+
+#
+# Same test (as with one row) but now with a cacheable query
+#
+
+$loop_time=new Benchmark;
+
+for ($i=0 ; $i < $opt_loop_count ; $i++)
+{
+  $sth = $dbh->do("select a,i,s from bench1") # Select * from table with 1 record
+    or die $DBI::errstr;
+}
+$end_time=new Benchmark;
+print "Time to select_1_row_cache ($opt_loop_count): " .
+  timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+
+#
+# The same test, but with 2 rows (not cacheable).
+#
+
+print "Testing select 2 rows from table\n";
+
+$sth = $dbh->do("insert into bench1 values(2,200,'BBB')")
+  or die $DBI::errstr;
+
+$loop_time=new Benchmark;
+
+for ($i=0 ; $i < $opt_loop_count ; $i++)
+{
+  $sth = $dbh->do("select a,i,s,$i from bench1") # Select * from table with 2 record
+    or die $DBI::errstr;
+}
+
+$end_time=new Benchmark;
+print "Time to select_2_rows ($opt_loop_count): " .
+  timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+
+#
+# Simple test to test speed of functions.
+#
+
+if ($limits->{'functions'})
+{
+  print "Test select with aritmetic (+)\n";
+  $loop_time=new Benchmark;
+
+  for ($i=0; $i < $opt_loop_count; $i++)
+  {
+    $sth = $dbh->do("select a+a+a+a+a+a+a+a+a+$i from bench1") or die $DBI::errstr;
+  }
+  $end_time=new Benchmark;
+  print "Time for select_column+column ($opt_loop_count): " .
+    timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+}
+
+$sth = $dbh->do("drop table bench1" . $server->{'drop_attr'})
+  or die $DBI::errstr;
+
+if ($opt_fast && defined($server->{vacuum}))
+{
+  $server->vacuum(0,\$dbh);
+}
+
+################################# PART:5 ###################################
+#### We'll create one table with a single blob field,but with a
+#### huge record in it and then we'll do $opt_loop_count selects
+#### from it.
+
+goto skip_blob_test if (!$limits->{'working_blobs'});
+
+print "Testing retrieval of big records ($str_length bytes)\n";
+
+do_many($dbh,$server->create("bench1", ["b blob"], []));
+$dbh->{LongReadLen}= $str_length; # Set retrieval buffer
+
+my $string=(A) x ($str_length); # This will make a string $str_length long.
+$sth = $dbh->prepare("insert into bench1 values(?)") or die $dbh->errstr;
+$sth->execute($string) or die $sth->errstr;
+undef($string);
+if ($opt_fast && defined($server->{vacuum}))
+{
+  $server->vacuum(0,\$dbh);
+}
+
+$loop_time=new Benchmark;
+
+for ($i=0 ; $i < $small_loop_count ; $i++)
+{
+  $sth = $dbh->prepare("select b,$i from bench1");
+  if (!$sth->execute || !(@row = $sth->fetchrow_array) ||
+      length($row[0]) != $str_length)
+  {
+    warn "$DBI::errstr - ".length($row[0])." - $str_length **\n";
+  }
+  $sth->finish;
+}
+
+$end_time=new Benchmark;
+print "Time to select_big_str ($small_loop_count): " .
+  timestr(timediff($end_time, $loop_time),"all") . "\n\n";
+
+$sth = $dbh->do("drop table bench1" . $server->{'drop_attr'})
+  or do
+{
+    # Fix for Access 2000
+    die $dbh->errstr if (!$server->abort_if_fatal_error());
+};
+
+if ($opt_fast && defined($server->{vacuum}))
+{
+  $server->vacuum(0,\$dbh);
+}
+
+skip_blob_test:
+
+################################ END ###################################
+####
+#### End of the test...Finally print time used to execute the
+#### whole test.
+
+$dbh->disconnect;
+end_benchmark($start_time);