[Commits] Rev 81: Extracted sql-bench test cases from conf/sql-bench-base.cnf for in file:///home/hakan/work/monty_program/mariadb-tools/

Hakan Kuecuekyilmaz hakan.kuecuekyilmaz at t-online.de
Fri Jan 14 03:44:44 EET 2011


At file:///home/hakan/work/monty_program/mariadb-tools/

------------------------------------------------------------
revno: 81
revision-id: hakan at askmonty.org-20110114014443-309h81u0m1y6f8p8
parent: hakan at askmonty.org-20110111014825-b1azjmzmp269ie47
committer: Hakan Kuecuekyilmaz <hakan at askmonty.org>
branch nick: mariadb-tools
timestamp: Fri 2011-01-14 02:44:43 +0100
message:
  Extracted sql-bench test cases from conf/sql-bench-base.cnf for
  better reusability.
  Added config file for my laptop lu0012 to do local tests of sql-bench scripting changes.
-------------- next part --------------
=== added file 'sql-bench/conf/lu0012.cnf'
--- a/sql-bench/conf/lu0012.cnf	1970-01-01 00:00:00 +0000
+++ b/sql-bench/conf/lu0012.cnf	2011-01-14 01:44:43 +0000
@@ -0,0 +1,48 @@
+# Configuration file for host: lu0012
+# 
+# OS: Ubuntu 10.10 (x86_64)
+# Platform: x86_64
+# CPU: Dual-core Intel Core2 Duo @ 2.80GHz
+# RAM: 4GB
+# Disk(s): HITACHI HTS722016K9SA00 160GB
+
+#
+# Adjust the following variables according to your system.
+#
+
+#
+# Directories.
+#
+
+# Where to store the test results.
+$sql_bench_results = '/home/hakan/sql-bench-results';
+
+# Where to compile the sources. You will need at least 1GB of disk space.
+$work_dir = '/tmp';
+
+#
+# Binaries.
+#
+
+# We need bzr >= 1.18.1.
+$bzr = '/usr/bin/bzr';
+
+$mktemp = '/bin/mktemp';
+
+$mkdir = '/bin/mkdir';
+
+# Set the concurrency level (-j) to about: number of CPUs + 1.
+$make = '/usr/bin/make -j3';
+
+# Perl with DBD::MySQL.
+$perl = '/usr/bin/perl';
+
+# If you use ccache, a compiler cache, which reduces compile time,
+# then set the path to it here.
+my $ccache = '/usr/bin/ccache';
+
+$ENV{'CC'}  = $ccache . " " . $ENV{'CC'};
+$ENV{'CXX'} = $ccache . " " . $ENV{'CXX'};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== modified file 'sql-bench/conf/sql-bench-base.cnf'
--- a/sql-bench/conf/sql-bench-base.cnf	2010-11-23 18:48:30 +0000
+++ b/sql-bench/conf/sql-bench-base.cnf	2011-01-14 01:44:43 +0000
@@ -20,102 +20,36 @@
 };
 
 #
-# Different test to be run with the above configuration.
-# The sql-bench-test will automaticly get --suffix=_test_name as an argument
-# The different options that can be used are:
+# Different tests to be run with the above configuration.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
 #
 # mysqld_start_options    Options given to the mysqld that is started.
 #                         This is prefixed with --skip-grant.
 # mysqld_init_command     SQL commands given to mysqld before tests starts.
 # sql_bench_options       Options given to sql-bench.
 #
-$sql_bench_test->{'base'} = {
-  mysqld_start_options => '',
-  mysqld_init_command => '',
-  sql_bench_options => '--comment="base test (with MyISAM)"',
-};
-
-# --userstat is available starting with MariaDB 5.2.
-$sql_bench_test->{'userstat'} = {
-  mysqld_start_options => '--userstat=1',
-  mysqld_init_command => '',
-  sql_bench_options => '--comment="userstat=1"',
-};
-
-$sql_bench_test->{'profiling'} = {
-  mysqld_start_options => '',
-  mysqld_init_command => '',
-  sql_bench_options => '--connect-command="set profiling=1" --comment="set profiling"',
-};
-
-$sql_bench_test->{'grant'} = {
-  mysqld_start_options => '',
-  mysqld_init_command => 'GRANT ALL PRIVILEGES to *.* to \'test at localhost\'',
-  sql_bench_options => '--comment="grant to everything"',
-};
-
-$sql_bench_test->{'grant-db'} = {
-  mysqld_start_options => '',
-  mysqld_init_command => 'GRANT ALL PRIVILEGES to test.* to \'test at localhost\'',
-  sql_bench_options => '--comment="grant to database"',
-};
-
-$sql_bench_test->{'grant-column'} = {
-  mysqld_start_options => '',
-  mysqld_init_command => 'GRANT ALL PRIVILEGES on test.* to \'test at localhost\'; CREATE table test.foo (a int); GRANT SELECT (a) on test.t1 to \'test at localhost\';',
-  sql_bench_options => '--comment="grant to database and column level grants"',
-};
-
-$sql_bench_test->{'tcpip'} = {
-  mysqld_start_options => '',
-  mysqld_init_command => '--connect_options=\'host=LOCALHOST\'',
-  sql_bench_options => '--comment="tcp/ip connection"',
-};
+
+# Tests to be run.
+require './tests/base.sqlbt';
+require './tests/userstat.sqlbt';
+require './tests/profiling.sqlbt';
+require './tests/grant.sqlbt';
+require './tests/grant-db.sqlbt';
+require './tests/grant-column.sqlbt';
+require './tests/tcpip.sqlbt';
 
 #
 # Tests with different storage engines
 #
-$sql_bench_test->{'myisam'} = {
-  mysqld_start_options => '--default-storage-engine=myisam --key-buffer-size=256M',
-  mysqld_init_command => '',
-  sql_bench_options => '--comment="engine=myisam key_buffer_size=256M"',
-};
-
-$sql_bench_test->{'heap'} = {
-  mysqld_start_options => '--default-storage-engine=heap --max-heap-table-size=1024M',
-  mysqld_init_command => '',
-  sql_bench_options => '--comment="engine=heap"',
-};
-
-$sql_bench_test->{'aria-trans-check'} = {
-  mysqld_start_options => '--default-storage-engine=aria --aria-pagecache-buffer-size=256M',
-  mysqld_init_command => '',
-  sql_bench_options => '--create-options="transactional=1 page_checksum=1" --comment="engine=aria aria-pagecache-buffer-size=256M transactional page_checksum"',
-};
-
-$sql_bench_test->{'aria-trans'} = {
-  mysqld_start_options => '--default-storage-engine=aria --aria-pagecache-buffer-size=256M',
-  mysqld_init_command => '',
-  sql_bench_options => '--create-options="transactional=1 page_checksum=0" --comment="engine=aria aria-pagecache-buffer-size=256M transactional"',
-};
-
-$sql_bench_test->{'aria-notrans'} = {
-  mysqld_start_options => '--default-storage-engine=aria --aria-pagecache-buffer-size=256M',
-  mysqld_init_command => '',
-  sql_bench_options => '--create-options="transactional=0 page_checksum=0" --comment="engine=aria aria-pagecache-buffer-size=256M  not transactional"',
-};
-
-$sql_bench_test->{'innodb'} = {
-  mysqld_start_options => '--default-storage-engine=innodb --innodb-buffer-pool-size=256M',
-  mysqld_init_command => '',
-  sql_bench_options => '--comment="engine=innodb innodb-buffer-pool-size=256M"',
-};
-
-$sql_bench_test->{'pbxt'} = {
-  mysqld_start_options => '--default-storage-engine=pbxt --pbxt-index-cache-size=64M --pbxt-record-cache-size=name=196M',
-  mysqld_init_command => '',
-  sql_bench_options => '--comment="engine=pbxt-index-cache-size=64M --pbxt-record-cache-size=name=196M"',
-};
+require './tests/myisam.sqlbt';
+require './tests/heap.sqlbt';
+require './tests/aria-trans-check.sqlbt';
+require './tests/aria-trans.sqlbt';
+require './tests/aria-notrans.sqlbt';
+require './tests/innodb.sqlbt';
+require './tests/pbxt.sqlbt';
 
 # This has to be the last line. See "perldoc -f require" for details.
 1;

=== modified file 'sql-bench/run-sql-bench.pl'
--- a/sql-bench/run-sql-bench.pl	2011-01-10 13:10:22 +0000
+++ b/sql-bench/run-sql-bench.pl	2011-01-14 01:44:43 +0000
@@ -60,7 +60,7 @@
 {
   print '[ERROR]: Do not run this script as root!' . "\n";
   print '  Exiting.';
-   
+
   exit 1;
 }
 
@@ -72,11 +72,12 @@
             or defined $help);
 
 sub usage
-{  
+{
   print "Please provide exactly three options.\n";
   print "  Example: $0 --config-file=[/path/to/config/file] --repository=[/path/to/bzr/repository] --suffix=[name_without_spaces]\n";
   print "  [name_without_spaces] is used as identifier in the result file (--suffix).\n";
-  exit;
+
+  exit 1;
 }
 
 # Base config file.
@@ -96,12 +97,12 @@
 
 #foreach my $sql_bench_test_name (keys %{$sql_bench_test}) {
 #    print "The value of $sql_bench_test_name is $sql_bench_test->{$sql_bench_test_name}\n";
-#    
+#
 #    foreach my $sql_bench_test_option (keys %{$sql_bench_test->{$sql_bench_test_name}}) {
 #        print "The value of $sql_bench_test_name $sql_bench_test_option is $sql_bench_test->{$sql_bench_test_name}->{$sql_bench_test_option}\n";
 #        print "\n";
 #    }
-#    
+#
 #    print "\n";
 #}
 #my $now = '';
@@ -154,7 +155,6 @@
 # Clean up of previous runs.
 qx(killall -9 mysqld);
 
-#my $temp_dir = qx(mktemp --directory);
 # Mac OS X needs explicit TMPDIR environment variable for mktemp -d to work.
 $ENV{'TMPDIR'} = $work_dir;
 my $temp_dir = qx($mktemp -d);
@@ -284,7 +284,7 @@
   $now = qx(date "+%Y-%m-%d %H:%M:%S");
   chomp($now);
   print "[$now]: Starting mysqld, ...\n";
-  
+
   chdir("$temp_dir/install")
     or die
     "[ERROR]: cd to $temp_dir/install failed.\n";
@@ -304,7 +304,7 @@
       $started = 0;
       last;
      }
-     
+
      sleep 1;
      $j++;
   }
@@ -325,7 +325,7 @@
     print "[ERROR]: Start of mysqld failed.\n";
     print "  Please check your error log.\n";
     print "  Exiting.\n";
-  
+
     exit 1;
   }
 

=== added directory 'sql-bench/tests'
=== added file 'sql-bench/tests/README.txt'
--- a/sql-bench/tests/README.txt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/README.txt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,8 @@
+Place your sql-bench related tests here.
+
+Note: name your test file like the $sql_bench_test array name. For
+  instance $sql_bench_test->{'base'} should be named
+           base.sqlbt
+
+--
+Hakan Kuecuekyilmaz, <hakan at askmonty dot org>, 2011-01-11.

=== added file 'sql-bench/tests/aria-notrans.sqlbt'
--- a/sql-bench/tests/aria-notrans.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/aria-notrans.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'aria-notrans'} = {
+  mysqld_start_options => '--default-storage-engine=aria --aria-pagecache-buffer-size=256M',
+  mysqld_init_command => '',
+  sql_bench_options => '--create-options="transactional=0 page_checksum=0" --comment="engine=aria aria-pagecache-buffer-size=256M  not transactional"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/aria-trans-check.sqlbt'
--- a/sql-bench/tests/aria-trans-check.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/aria-trans-check.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'aria-trans-check'} = {
+  mysqld_start_options => '--default-storage-engine=aria --aria-pagecache-buffer-size=256M',
+  mysqld_init_command => '',
+  sql_bench_options => '--create-options="transactional=1 page_checksum=1" --comment="engine=aria aria-pagecache-buffer-size=256M transactional page_checksum"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/aria-trans.sqlbt'
--- a/sql-bench/tests/aria-trans.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/aria-trans.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'aria-trans'} = {
+  mysqld_start_options => '--default-storage-engine=aria --aria-pagecache-buffer-size=256M',
+  mysqld_init_command => '',
+  sql_bench_options => '--create-options="transactional=1 page_checksum=0" --comment="engine=aria aria-pagecache-buffer-size=256M transactional"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/base.sqlbt'
--- a/sql-bench/tests/base.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/base.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,19 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+$sql_bench_test->{'base'} = {
+  mysqld_start_options => '',
+  mysqld_init_command => '',
+  sql_bench_options => '--comment="base test (with MyISAM)"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/grant-column.sqlbt'
--- a/sql-bench/tests/grant-column.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/grant-column.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'grant-column'} = {
+  mysqld_start_options => '',
+  mysqld_init_command => 'GRANT ALL PRIVILEGES on test.* to \'test at localhost\'; CREATE table test.foo (a int); GRANT SELECT (a) on test.t1 to \'test at localhost\';',
+  sql_bench_options => '--comment="grant to database and column level grants"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/grant-db.sqlbt'
--- a/sql-bench/tests/grant-db.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/grant-db.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'grant-db'} = {
+  mysqld_start_options => '',
+  mysqld_init_command => 'GRANT ALL PRIVILEGES to test.* to \'test at localhost\'',
+  sql_bench_options => '--comment="grant to database"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/grant.sqlbt'
--- a/sql-bench/tests/grant.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/grant.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'grant'} = {
+  mysqld_start_options => '',
+  mysqld_init_command => 'GRANT ALL PRIVILEGES to *.* to \'test at localhost\'',
+  sql_bench_options => '--comment="grant to everything"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/heap.sqlbt'
--- a/sql-bench/tests/heap.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/heap.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'heap'} = {
+  mysqld_start_options => '--default-storage-engine=heap --max-heap-table-size=1024M',
+  mysqld_init_command => '',
+  sql_bench_options => '--comment="engine=heap"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/innodb.sqlbt'
--- a/sql-bench/tests/innodb.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/innodb.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'innodb'} = {
+  mysqld_start_options => '--default-storage-engine=innodb --innodb-buffer-pool-size=256M',
+  mysqld_init_command => '',
+  sql_bench_options => '--comment="engine=innodb innodb-buffer-pool-size=256M"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/myisam.sqlbt'
--- a/sql-bench/tests/myisam.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/myisam.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'myisam'} = {
+  mysqld_start_options => '--default-storage-engine=myisam --key-buffer-size=256M',
+  mysqld_init_command => '',
+  sql_bench_options => '--comment="engine=myisam key_buffer_size=256M"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/pbxt.sqlbt'
--- a/sql-bench/tests/pbxt.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/pbxt.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'pbxt'} = {
+  mysqld_start_options => '--default-storage-engine=pbxt --pbxt-index-cache-size=64M --pbxt-record-cache-size=name=196M',
+  mysqld_init_command => '',
+  sql_bench_options => '--comment="engine=pbxt-index-cache-size=64M --pbxt-record-cache-size=name=196M"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/profiling.sqlbt'
--- a/sql-bench/tests/profiling.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/profiling.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'profiling'} = {
+  mysqld_start_options => '',
+  mysqld_init_command => '',
+  sql_bench_options => '--connect-command="set profiling=1" --comment="set profiling"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/tcpip.sqlbt'
--- a/sql-bench/tests/tcpip.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/tcpip.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,20 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+$sql_bench_test->{'tcpip'} = {
+  mysqld_start_options => '',
+  mysqld_init_command => '--connect_options=\'host=LOCALHOST\'',
+  sql_bench_options => '--comment="tcp/ip connection"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;

=== added file 'sql-bench/tests/userstat.sqlbt'
--- a/sql-bench/tests/userstat.sqlbt	1970-01-01 00:00:00 +0000
+++ b/sql-bench/tests/userstat.sqlbt	2011-01-14 01:44:43 +0000
@@ -0,0 +1,21 @@
+#
+# Test to be run with configuration in the file, which is including this test.
+#
+# This sql-bench-test will automaticly get --suffix=_test_name as an argument
+# The different options which can be used are:
+#
+# mysqld_start_options    Options given to the mysqld that is started.
+#                         This is prefixed with --skip-grant.
+# mysqld_init_command     SQL commands given to mysqld before tests starts.
+# sql_bench_options       Options given to sql-bench.
+#
+
+# --userstat is available starting with MariaDB 5.2.
+$sql_bench_test->{'userstat'} = {
+  mysqld_start_options => '--userstat=1',
+  mysqld_init_command => '',
+  sql_bench_options => '--comment="userstat=1"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;



More information about the commits mailing list