bk commit into 5.1 tree (tomas:1.2347)

[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.2347 06/04/21 14:00:44 tomas@stripped +4 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  mysql-test/ndb/ndbcluster.sh
    1.50 06/04/21 14:00:38 tomas@stripped +1 -2
    manual merge

  mysql-test/mysql-test-run.sh
    1.318 06/04/21 14:00:38 tomas@stripped +1 -2
    manual merge

  mysql-test/mysql-test-run.pl
    1.107 06/04/21 14:00:38 tomas@stripped +0 -1
    manual merge

  storage/ndb/include/util/ndb_opts.h
    1.16 06/04/21 13:56:13 tomas@stripped +0 -0
    Auto merged

  storage/ndb/include/util/ndb_opts.h
    1.10.5.2 06/04/21 13:56:12 tomas@stripped +0 -0
    Merge rename: ndb/include/util/ndb_opts.h -> storage/ndb/include/util/ndb_opts.h

# 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/RESYNC

--- 1.317/mysql-test/mysql-test-run.sh	2006-04-19 09:39:53 +02:00
+++ 1.318/mysql-test/mysql-test-run.sh	2006-04-21 14:00:38 +02:00
@@ -1230,7 +1230,7 @@
     then
       NDBCLUSTER_EXTRA_OPTS="--small"
     fi
-    OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core"
+    OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core"
     if [ "x$NDB_VERBOSE" != "x0" ] ; then
       echo "Starting master ndbcluster " $OPTS
     fi

--- 1.106/mysql-test/mysql-test-run.pl	2006-04-20 14:42:58 +02:00
+++ 1.107/mysql-test/mysql-test-run.pl	2006-04-21 14:00:38 +02:00
@@ -1524,6 +1524,7 @@
   if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
 	       ["--port=$opt_ndbcluster_port",
 		"--data-dir=$opt_vardir",
+	        "--character-sets-dir=$path_charsetsdir"],
 		"--verbose=2",
 	        "--core"],
 	       "", "/dev/null", "", "") )

--- 1.49/mysql-test/ndb/ndbcluster.sh	2006-02-02 21:20:16 +01:00
+++ 1.50/mysql-test/ndb/ndbcluster.sh	2006-04-21 14:00:38 +02:00
@@ -66,6 +66,7 @@
 NDB_MGM_EXTRA_OPTS=
 NDB_MGMD_EXTRA_OPTS=
 NDBD_EXTRA_OPTS=
+CHARSETSDIR=
 
 while test $# -gt 0; do
   case "$1" in
@@ -119,6 +120,9 @@
     --ndbd-extra-opts=*)
      NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`
      ;;
+    --character-sets-dir=*)
+     CHARSETSDIR=`echo "$1" | sed -e "s;--character-sets-dir=;;"`
+     ;;
     --core)
      opt_core="--core"
      ;;
@@ -159,7 +163,7 @@
 
 exec_mgmtclient="$exec_mgmtclient --no-defaults $opt_core $NDB_MGM_EXTRA_OPTS"
 exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $opt_core $NDB_MGMD_EXTRA_OPTS"
-exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS"
+exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR"
 exec_waiter="$exec_waiter --no-defaults $opt_core"
 
 ndb_host="localhost"