mysql-test-run.pl:

  Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris


bdb/dist/s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_java:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_readme:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_test:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_vxworks:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32_dsp:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
scripts/make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_src_distribution.sh:
  Copy all content in mysql-test
mysql-test/mysql-test-run.pl:
  Removed -c from /bin/sh call

7 files changed, 10 insertions, 8 deletions

diff --git a/bdb/dist/s_java b/bdb/dist/s_java
index f3c856d0532..f7c96e823a1 100755
--- a/bdb/dist/s_java
+++ b/bdb/dist/s_java
@@ -5,7 +5,7 @@
 
 msgjava="/* DO NOT EDIT: automatically built by dist/s_java. */"
 
-. RELEASE
+. ./RELEASE
 
 t=/tmp/__java
 c=/tmp/__javajnic
diff --git a/bdb/dist/s_javah b/bdb/dist/s_javah
index 480856e4b5c..67c41d09c4d 100755
--- a/bdb/dist/s_javah
+++ b/bdb/dist/s_javah
@@ -8,7 +8,7 @@
 # Using Sun's JDK rather than some other installation ensures
 # that the header files will not be constantly changed.
 
-. RELEASE
+. ./RELEASE
 
 JAVAC=javac
 JAVAH=javah
diff --git a/bdb/dist/s_readme b/bdb/dist/s_readme
index 229a152b8a9..1da9f9681c0 100755
--- a/bdb/dist/s_readme
+++ b/bdb/dist/s_readme
@@ -8,7 +8,7 @@ d=..
 t=/tmp/__t
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
-. RELEASE
+. ./RELEASE
 
 cat << END_OF_README>$t
 $DB_VERSION_STRING
diff --git a/bdb/dist/s_test b/bdb/dist/s_test
index 266f27a743f..16f3b9712d0 100755
--- a/bdb/dist/s_test
+++ b/bdb/dist/s_test
@@ -9,7 +9,7 @@ msg2="# Automatically built by dist/s_test; may require local editing."
 t=/tmp/__t
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
-. RELEASE
+. ./RELEASE
 
 (echo "$msg1"					&& \
  echo ""					&& \
diff --git a/bdb/dist/s_vxworks b/bdb/dist/s_vxworks
index b7cf785f78b..05c2599d02c 100644
--- a/bdb/dist/s_vxworks
+++ b/bdb/dist/s_vxworks
@@ -5,7 +5,7 @@
 
 msgc="/* DO NOT EDIT: automatically built by dist/s_vxworks. */"
 
-. RELEASE
+. ./RELEASE
 
 s=/tmp/__db_a
 t=/tmp/__db_b
diff --git a/bdb/dist/s_win32 b/bdb/dist/s_win32
index 78814ababa1..207978b82bb 100755
--- a/bdb/dist/s_win32
+++ b/bdb/dist/s_win32
@@ -6,7 +6,7 @@
 msgc="/* DO NOT EDIT: automatically built by dist/s_win32. */"
 msgw="; DO NOT EDIT: automatically built by dist/s_win32."
 
-. RELEASE
+. ./RELEASE
 
 s=/tmp/__db_a$$
 t=/tmp/__db_b$$
diff --git a/bdb/dist/s_win32_dsp b/bdb/dist/s_win32_dsp
index 3b0bef831ba..af5551ec248 100644
--- a/bdb/dist/s_win32_dsp
+++ b/bdb/dist/s_win32_dsp
@@ -3,7 +3,7 @@
 #
 # Build Windows/32 .dsp files.
 
-. RELEASE
+. ./RELEASE
 
 BUILDDIR=../build_win32
 SRCFILES=srcfiles.in
@@ -35,7 +35,9 @@ create_dsp()
             -e "s/@srcfile@/$srcfile/g" \
             < $srctemplate >> $dspoutput.insert
     done
-    sed -e "/@SOURCE_FILES@/r$dspoutput.insert" \
+    # We need exactly one space after the 'r' modifier
+    # See 5.9 in http://www.student.northpark.edu/pemente/sed/sedfaq.txt
+    sed -e "/@SOURCE_FILES@/r $dspoutput.insert" \
         -e "/@SOURCE_FILES@/d" \
         -e "s/@project_name@/$projname/g" \
         -e "s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/g" \