[Commits] Rev 67: Added machine specific config file for pitbull. in file:///Users/hakan/work/monty_program/mariadb-tools/

Hakan Kuecuekyilmaz hakan.kuecuekyilmaz at t-online.de
Thu Nov 18 02:49:02 EET 2010


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

------------------------------------------------------------
revno: 67
revision-id: hakan at askmonty.org-20101118004901-laqm9v9welqwwifd
parent: hakan at askmonty.org-20101113152550-th70w7lsu7ixzr2k
committer: Hakan Kuecuekyilmaz <hakan at askmonty.org>
branch nick: mariadb-tools
timestamp: Thu 2010-11-18 01:49:01 +0100
message:
  Added machine specific config file for pitbull.
-------------- next part --------------
=== modified file 'sql-bench/conf/au0013.cnf'
--- a/sql-bench/conf/au0013.cnf	2010-11-11 21:56:09 +0000
+++ b/sql-bench/conf/au0013.cnf	2010-11-18 00:49:01 +0000
@@ -38,7 +38,7 @@
 $perl = '/sw/bin/perl';
 
 # If you use ccache, a compiler cache, which reduces compile time,
-# then set the path here.
+# then set the path to it here.
 my $ccache = '/sw/bin/ccache';
 
 $ENV{'CC'}  = $ccache . " " . $ENV{'CC'};

=== added file 'sql-bench/conf/pitbull.cnf'
--- a/sql-bench/conf/pitbull.cnf	1970-01-01 00:00:00 +0000
+++ b/sql-bench/conf/pitbull.cnf	2010-11-18 00:49:01 +0000
@@ -0,0 +1,48 @@
+# Configuration file for host: pitbull
+#
+# OS: Ubuntu 10.10
+# Platform: x86_64
+# CPU: Two socket hexa-core Intel Xeon X5660 @ 2.80GHz
+# RAM: 23GB
+# Disk(s): 1 x ST3500320NS S-ATA
+
+#
+# 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-11 21:56:09 +0000
+++ b/sql-bench/conf/sql-bench-base.cnf	2010-11-18 00:49:01 +0000
@@ -35,6 +35,7 @@
   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 => '',

=== added file 'sql-bench/conf/sql-bench-only_base_test.cnf'
--- a/sql-bench/conf/sql-bench-only_base_test.cnf	1970-01-01 00:00:00 +0000
+++ b/sql-bench/conf/sql-bench-only_base_test.cnf	2010-11-18 00:49:01 +0000
@@ -0,0 +1,56 @@
+# Base configuration for running sql-bench tests.
+#
+# This is the minimal base test version
+#
+# Hakan Kuecuekyilmaz, <hakan at askmonty dot org>, 2010-11-18.
+
+# Configure environment variables.
+# Note: ccache is checked in the host specific config file.
+$ENV{'CC'} = "gcc";
+$ENV{'CFLAGS'} = "-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-com
+pare -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wunused-parameter -O3 -fno-omit-frame-po
+inter";
+$ENV{'CXX'} = "gcc";
+$ENV{'CXXFLAGS'} = "-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-c
+ompare -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wreorder -Wctor-dtor-privacy -Wnon-vir
+tual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer";
+$ENV{'CXXLDFLAGS'} = "";
+
+$config = {
+  # Configure invocation line.
+  # Do not use --prefix here.
+  configure_line => '--enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-big-tables --with-plugi
+n-maria --with-maria-tmp-tables --without-plugin-innodb_plugin --with-mysqld-ldflags=-static --with-client-ldflags=-static --wit
+h-readline --with-ssl --with-plugins=max-no-ndb --with-embedded-server --with-libevent --enable-local-infile',
+};
+
+#
+# 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:
+#
+# 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)"',
+};
+
+$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"',
+};
+
+# This has to be the last line. See "perldoc -f require" for details.
+1;



More information about the commits mailing list