bk commit into 5.1 tree (tomas:1.2072)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2072 06/01/23 10:42:02 tomas@stripped +3 -0
  added option for relative pat in ndb config
  added option for verbose ndb startup

  mysql-test/ndb/ndbcluster.sh
    1.47 06/01/23 10:41:55 tomas@stripped +10 -1
    added option for relative pat in ndb config

  mysql-test/mysql-test-run.sh
    1.291 06/01/23 10:41:55 tomas@stripped +11 -4
    added option for relative pat in ndb config
    added option for verbose ndb startup

  mysql-test/mysql-test-run.pl
    1.56 06/01/23 10:41:55 tomas@stripped +4 -2
    added option for relative pat in ndb config

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.290/mysql-test/mysql-test-run.sh	2006-01-20 14:49:51 +01:00
+++ 1.291/mysql-test/mysql-test-run.sh	2006-01-23 10:41:55 +01:00
@@ -272,6 +272,7 @@
 USE_RUNNING_NDBCLUSTER=""
 USE_RUNNING_NDBCLUSTER_SLAVE=""
 NDB_EXTRA_TEST=0
+NDB_VERBOSE=0
 NDBCLUSTER_EXTRA_OPTS=""
 USE_PURIFY=""
 PURIFY_LOGS=""
@@ -357,6 +358,8 @@
       NDBCLUSTER_EXTRA_OPTS=" "
       NDB_EXTRA_TEST=1 ;
       ;;
+    --ndb-verbose)
+      NDB_VERBOSE=2 ;;
     --ndb_mgm-extra-opts=*)
       NDB_MGM_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgm-extra-opts=;;"` ;;
     --ndb_mgmd-extra-opts=*)
@@ -1273,8 +1276,10 @@
     then
       NDBCLUSTER_EXTRA_OPTS="--small"
     fi
-    OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --verbose=2 --initial"
-    echo "Starting master ndbcluster " $OPTS
+    OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --verbose=$NDB_VERBOSE --initial --relative-config-data-dir"
+    if [ "x$NDB_VERBOSE" != "x0" ] ; then
+      echo "Starting master ndbcluster " $OPTS
+    fi
     ./ndb/ndbcluster $OPTS || NDB_STATUS_OK=0
     if [ x$NDB_STATUS_OK != x1 ] ; then
       if [ x$FORCE != x1 ] ; then
@@ -1504,8 +1509,10 @@
          NDBCLUSTER_EXTRA_OPTS="--small"
       fi
 
-      OPTS="$NDBCLUSTER_OPTS_SLAVE --initial $NDBCLUSTER_EXTRA_OPTS --ndbd-nodes=1 --verbose=2"
-      echo "Starting slave ndbcluster " $OPTS
+      OPTS="$NDBCLUSTER_OPTS_SLAVE --initial $NDBCLUSTER_EXTRA_OPTS --ndbd-nodes=1 --verbose=$NDB_VERBOSE --relative-config-data-dir"
+      if [ "x$NDB_VERBOSE" != "x0" ] ; then
+        echo "Starting slave ndbcluster " $OPTS
+      fi
       ./ndb/ndbcluster $OPTS \
                       || NDB_SLAVE_STATUS_OK=0
       #                > /dev/null 2>&1 || NDB_SLAVE_STATUS_OK=0

--- 1.55/mysql-test/mysql-test-run.pl	2006-01-20 14:49:51 +01:00
+++ 1.56/mysql-test/mysql-test-run.pl	2006-01-23 10:41:55 +01:00
@@ -1371,7 +1371,8 @@
 		 "--data-dir=$opt_vardir",
 		 "--verbose=2",
 		 $ndbcluster_opts,
-		 "--initial"],
+		 "--initial",
+                 "--relative-config-data-dir"],
 		"", "", "", "") )
   {
     mtr_error("Error ndbcluster_install");
@@ -1463,7 +1464,8 @@
 		 "--verbose=2",
 		 "--small",
 		 "--ndbd-nodes=1",
-		 "--initial"],
+		 "--initial",
+		 "--relative-config-data-dir"],
 		"", "", "", "") )
   {
     mtr_error("Error ndbcluster_install_slave");

--- 1.46/mysql-test/ndb/ndbcluster.sh	2006-01-19 19:32:52 +01:00
+++ 1.47/mysql-test/ndb/ndbcluster.sh	2006-01-23 10:41:55 +01:00
@@ -52,6 +52,7 @@
 status_ndb=
 ndb_diskless=0
 ndbd_nodes=2
+relative_config_data_dir=
 
 ndb_no_ord=512
 ndb_no_attr=2048
@@ -99,6 +100,9 @@
     --data-dir=*)
      fsdir=`echo "$1" | sed -e "s;--data-dir=;;"`
      ;;
+    --relative-config-data-dir)
+     relative_config_data_dir=1
+     ;;
     --port=*)
      port=`echo "$1" | sed -e "s;--port=;;"`
      ;;
@@ -196,6 +200,11 @@
 # Start management server as deamon
 
 # Edit file system path and ports in config file
+if [ $relative_config_data_dir ] ; then
+  config_fs_ndb="."
+else
+  config_fs_ndb=$fs_ndb
+fi
 if [ $initial_ndb ] ; then
   rm -rf $fs_ndb/ndb_* 2>&1 | cat > /dev/null
   sed \
@@ -206,7 +215,7 @@
     -e s,"CHOOSE_IndexMemory","$ndb_imem",g \
     -e s,"CHOOSE_Diskless","$ndb_diskless",g \
     -e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \
-    -e s,"CHOOSE_FILESYSTEM","$fs_ndb",g \
+    -e s,"CHOOSE_FILESYSTEM","$config_fs_ndb",g \
     -e s,"CHOOSE_PORT_MGM","$ndb_mgmd_port",g \
     -e s,"CHOOSE_DiskPageBufferMemory","$ndb_pbmem",g \
     < "$config_ini" \