bk commit into 5.1 tree (kent:1.2309)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2309 06/04/10 14:15:02 kent@stripped +2 -0
  mysql-test-run.pl:
    Added --ndbcluster_port for backward compatibility
  make_win_src_distribution.sh:
    Updated to reflect 5.1 changes

  mysql-test/mysql-test-run.pl
    1.96 06/04/10 14:12:57 kent@stripped +1 -1
    Added --ndbcluster_port for backward compatibility

  scripts/make_win_src_distribution.sh
    1.52 06/04/10 13:15:20 kent@stripped +3 -7
    Updated to reflect 5.1 changes

# 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:	kent
# Host:	c-534072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.51/scripts/make_win_src_distribution.sh	2006-03-01 21:10:25 +01:00
+++ 1.52/scripts/make_win_src_distribution.sh	2006-04-10 13:15:20 +02:00
@@ -184,7 +184,7 @@
 rm -r -f "$BASE/share/Makefile.in"
 rm -r -f "$BASE/share/Makefile.am"
 
-mkdir $BASE/Docs $BASE/extra $BASE/include $BASE/storage
+mkdir $BASE/Docs $BASE/extra $BASE/include
 
 #
 # Copy directory files
@@ -251,7 +251,7 @@
 
 for i in client dbug extra storage/heap include storage/archive storage/csv \
          include/mysql libmysql libmysqld storage/myisam storage/example \
-         storage/myisammrg mysys regex sql strings sql-common sql/examples \
+         storage/myisammrg mysys regex sql strings sql-common \
          tools vio zlib
 do
   copy_dir_files $i
@@ -260,7 +260,7 @@
 #
 # Create project files for ndb
 #
-make -C $SOURCE/storage/ndb windoze
+#make -C $SOURCE/storage/ndb windoze
 
 #
 # Input directories to be copied recursively
@@ -298,8 +298,6 @@
   fi
 done
 
-cp extra/sql_state.h extra/mysqld_error.h $BASE/include
-
 #
 # support files
 #
@@ -350,8 +348,6 @@
   do
     unix_to_dos $v
   done
-# File extension '.txt' matches too many other files, error messages etc.
-unix_to_dos $BASE/Docs/*.txt 
 
 mv $BASE/README $BASE/README.txt
 

--- 1.95/mysql-test/mysql-test-run.pl	2006-04-08 04:29:02 +02:00
+++ 1.96/mysql-test/mysql-test-run.pl	2006-04-10 14:12:57 +02:00
@@ -608,7 +608,7 @@
              # Specify ports
              'master_port=i'            => \$opt_master_myport,
              'slave_port=i'             => \$opt_slave_myport,
-             'ndbcluster-port=i'        => \$opt_ndbcluster_port,
+             'ndbcluster-port|ndbcluster_port=i' => \$opt_ndbcluster_port,
              'ndbcluster-port-slave=i'  => \$opt_ndbcluster_port_slave,
              'manager-port=i'           => \$opt_manager_port, # Currently not used
              'im-port=i'                => \$im_port, # Instance Manager port.