From 9374c2d65a2e25948ac3fc6887c0afd47348045f Mon Sep 17 00:00:00 2001
From: unknown <magnus@neptunus.(none)>
Date: Fri, 30 Apr 2004 10:08:44 +0200
Subject: Updated default NDB config to work better with sql-bench Updated
 sql-bench configs to take NDB's limitations into account

mysql-test/mysql-test-run.sh:
  Instruct run-all-tests to create tables in NDB if USE_NDBCLUSTER is set
mysql-test/ndb/ndb_config_2_node.ini:
  Increase MaxNumberOfOperations to 100000 to support large deletes and inserts.
sql-bench/server-cfg.sh:
  Add settings and limitations for NDB
---
 mysql-test/mysql-test-run.sh         | 11 +++++++++--
 mysql-test/ndb/ndb_config_2_node.ini |  1 +
 sql-bench/server-cfg.sh              |  7 +++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 36f11220862..fd992714f36 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1469,16 +1469,23 @@ $ECHO  "Starting Tests"
 #
 if [ "$DO_BENCH" = 1 ]
 then
+  start_master
+
+  if [ ! -z "$USE_NDBCLUSTER" ]
+  then
+    EXTRA_BENCH_ARGS="--create-options=TYPE=ndb"
+  fi 
+
   BENCHDIR=$BASEDIR/sql-bench/
   savedir=`pwd`
   cd $BENCHDIR
   if [ -z "$1" ]
   then
-    ./run-all-tests --socket=$MASTER_MYSOCK --user=root
+    ./run-all-tests --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS
   else
     if [ -x "./$1" ]
     then
-       ./$1 --socket=$MASTER_MYSOCK --user=root
+       ./$1 --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS
     else
       echo "benchmark $1 not found"
     fi
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index 9e0f8254c78..57aa2f527e0 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -2,6 +2,7 @@
 #NoOfFragmentLogfiles: 1
 #TimeBetweenLocalCheckpoints: 31
 NoOfReplicas: 2
+MaxNoOfConcurrentOperations: 100000
 
 [COMPUTER]
 Id: 1
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index 905e7ee65be..9d5df27379c 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -183,6 +183,13 @@ sub new
   {
     $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) &&
       $main::opt_create_options =~ /type=bdb/i)
   {
-- 
cgit v1.2.1