From 113efc004657ca9aa6c1867dce23fd86bf4376e3 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Wed, 29 Mar 2006 22:33:27 +0200
Subject: [PATCH 1/3] Makefile.am:   Use "dist_bin_SCRIPTS" to get a script
 distributed

ndb/tools/Makefile.am:
  Use "dist_bin_SCRIPTS" to get a script distributed
---
 ndb/tools/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndb/tools/Makefile.am b/ndb/tools/Makefile.am
index 4819f8ff289..d16b7387534 100644
--- a/ndb/tools/Makefile.am
+++ b/ndb/tools/Makefile.am
@@ -1,5 +1,5 @@
 
-bin_SCRIPTS =		ndb_size.pl
+dist_bin_SCRIPTS =	ndb_size.pl
 dist_pkgdata_DATA =	ndb_size.tmpl
 
 ndbtools_PROGRAMS = \

From 2d8acd2fdcd4c1dc49e58dc98babc85ff6d62838 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Wed, 29 Mar 2006 23:51:23 +0200
Subject: [PATCH 2/3] mysqld_safe.sh:   Added --help option, bug#16392
 acinclude.m4:   Use "$shrext_cmds" when testing if shared library exists,
 bug#16332

acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332
scripts/mysqld_safe.sh:
  Added --help option, bug#16392
---
 acinclude.m4           |  9 ++++++---
 scripts/mysqld_safe.sh | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 0a5778285ea..d9b8030696d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -310,8 +310,9 @@ case $SYSTEM_TYPE in
         fi
         ;;
       *)
+        # Just to be safe, we test for ".so" anyway
         if test \( -f "$mysql_zlib_dir/lib/libz.a"  -o -f "$mysql_zlib_dir/lib/libz.so" -o \
-                   -f "$mysql_zlib_dir/lib/libz.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib" \) \
+                   -f "$mysql_zlib_dir/lib/libz$shrext_cmds" \) \
                 -a -f "$mysql_zlib_dir/include/zlib.h"; then
           ZLIB_INCLUDES="-I$mysql_zlib_dir/include"
           ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
@@ -976,7 +977,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
       for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
 /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \
 /usr/freeware/lib32 /usr/local/lib/ ; do
-      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then
+      # Just to be safe, we test for ".so" anyway
+      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext_cmds ; then
         OPENSSL_LIB=$d
       fi
       done
@@ -988,7 +990,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
       if test -f $incs/openssl/ssl.h  ; then
         OPENSSL_INCLUDE=-I$incs
       fi
-      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl.dylib ; then
+      # Just to be safe, we test for ".so" anyway
+      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext_cmds ; then
         OPENSSL_LIB=$libs
       fi
       ;;
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 6ce4c1e0da8..c655910dc2c 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -24,6 +24,31 @@ case "$1" in
       ;;
 esac
 
+usage () {
+        cat <<EOF
+Usage: $0 [OPTIONS]
+  --no-defaults              Don't read the system defaults file
+  --defaults-file=FILE       Use the specified defaults file
+  --defaults-extra-file=FILE Also use defaults from the specified file
+  --ledir=DIRECTORY          Look for mysqld in the specified directory
+  --err-log=FILE             Obsolete, use '--log-error'
+  --log-error=FILE           Log errors to the specified log file
+  --open-files=LIMIT         Obsolete, use '--open-files-limit'
+  --open-files-limit=LIMIT   Limit the number of open files
+  --core-file-size=LIMIT     Limit core files to the specified size
+  --timezone=TZ              Set the system timezone
+  --mysqld=FILE              Use the specified file as mysqld
+  --mysqld-version=VERSION   Use "mysqld-VERSION" as mysqld
+  --nice=NICE                Set the scheduling priority of mysqld
+  --skip-kill-mysqld         Don't try to kill stray mysqld processes
+
+All other options are passed to the mysqld program.
+
+EOF
+        exit 1
+}
+
+
 parse_arguments() {
   # We only need to pass arguments through to the server if we don't
   # handle them here.  So, we collect unrecognized options (passed on
@@ -72,6 +97,9 @@ parse_arguments() {
 	fi
 	;;
       --nice=*) niceness=`echo "$arg" | sed -e "s;--nice=;;"` ;;
+      --help)
+        usage
+        ;;
       *)
         if test -n "$pick_args"
         then

From 3479ec37801027bb4767af9e586d5396b8416a39 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Thu, 30 Mar 2006 00:48:46 +0200
Subject: [PATCH 3/3] mysql-test-run.pl:   Check that port range is valid,
 bug#16807

mysql-test/mysql-test-run.pl:
  Check that port range is valid, bug#16807
---
 mysql-test/mysql-test-run.pl | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 6aa97ba6d37..d4f759604dd 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -477,6 +477,10 @@ sub command_line_setup () {
   # 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
   # all port numbers might not be used in this version of the script.
   #
+  # Also note the limiteation of ports we are allowed to hand out. This
+  # differs between operating systems and configuration, see
+  # http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html
+  # But a fairly safe range seems to be 5001 - 32767
   if ( $ENV{'MTR_BUILD_THREAD'} )
   {
     # Up to two masters, up to three slaves
@@ -485,6 +489,13 @@ sub command_line_setup () {
     $opt_ndbcluster_port= $opt_master_myport + 5;
   }
 
+  if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
+  {
+    mtr_error("MTR_BUILD_THREAD number results in a port",
+              "outside 5001 - 32767",
+              "($opt_master_myport - $opt_master_myport + 10)");
+  }
+
   # Read the command line
   # Note: Keep list, and the order, in sync with usage at end of this file