database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Updated default NDB config to work better with sql-bench

Browse Source 
Updated sql-bench configs to take NDB's limitations into account
This commit is contained in:
magnus@neptunus.(none)
2004-04-30 10:08:44 +02:00
parent cfbabb0245
commit ed6148da75
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/mysql-test-run.sh
View File

@ -1469,16 +1469,23 @@ $ECHO "Starting Tests"
# #
if [ "$DO_BENCH" = 1 ] if [ "$DO_BENCH" = 1 ]
then then
start_master
if [ ! -z "$USE_NDBCLUSTER" ]
then
EXTRA_BENCH_ARGS="--create-options=TYPE=ndb"
fi
BENCHDIR=$BASEDIR/sql-bench/ BENCHDIR=$BASEDIR/sql-bench/
savedir=`pwd` savedir=`pwd`
cd $BENCHDIR cd $BENCHDIR
if [ -z "$1" ] if [ -z "$1" ]
then then
./run-all-tests --socket=$MASTER_MYSOCK --user=root ./run-all-tests --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS
else else
if [ -x "./$1" ] if [ -x "./$1" ]
then then
./$1 --socket=$MASTER_MYSOCK --user=root ./$1 --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS
else else
echo "benchmark $1 not found" echo "benchmark $1 not found"
fi fi

1
mysql-test/ndb/ndb_config_2_node.ini
View File

@ -2,6 +2,7 @@
#NoOfFragmentLogfiles: 1 #NoOfFragmentLogfiles: 1
#TimeBetweenLocalCheckpoints: 31 #TimeBetweenLocalCheckpoints: 31
NoOfReplicas: 2 NoOfReplicas: 2
MaxNoOfConcurrentOperations: 100000
[COMPUTER] [COMPUTER]
Id: 1 Id: 1

7
sql-bench/server-cfg.sh
View File

@ -183,6 +183,13 @@ sub new
{ {
$self->{'transactions'} = 1; # Transactions enabled $self->{'transactions'} = 1; # Transactions enabled
} }
if (defined($main::opt_create_options) &&
$main::opt_create_options =~ /type=ndb/i)
{
$self->{'transactions'} = 1; # Transactions enabled
$limits{'max_columns'} = 90; # Max number of columns in table
$limits{'working_blobs'} = 0; # NDB tables can't handle BLOB's
}
if (defined($main::opt_create_options) && if (defined($main::opt_create_options) &&
$main::opt_create_options =~ /type=bdb/i) $main::opt_create_options =~ /type=bdb/i)
{ {