bk commit into 5.1 tree (joerg:1.2519)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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@stripped, 2007-05-16 10:12:33+02:00, joerg@trift2. +1 -0
  Merge trift2.:/MySQL/M50/bug27833-5.0
  into  trift2.:/MySQL/M51/bug27833-5.1
  MERGE: 1.1810.2870.44

  BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2007-05-16 10:12:29+02:00, joerg@trift2.
+3 -3
    Manual merge - even to a "deleted" file.
    MERGE: 1.1.13.2

  BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2007-05-16 09:58:57+02:00,
joerg@trift2. +0 -0
    Merge rename: scripts/make_win_bin_dist -> BitKeeper/deleted/.del-make_win_bin_dist

# 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:	joerg
# Host:	trift2.
# Root:	/MySQL/M51/bug27833-5.1/RESYNC

--- 1.1.13.1/scripts/make_win_bin_dist	2007-05-15 18:19:15 +02:00
+++ 1.14/BitKeeper/deleted/.del-make_win_bin_dist	2007-05-16 10:12:29 +02:00
@@ -127,20 +127,11 @@
   usage
 fi
 
-trap 'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR
-
 # ----------------------------------------------------------------------
-# Adjust target name if needed, release with debug info has another name
+# Copy executables, and client DLL (FIXME why?)
 # ----------------------------------------------------------------------
 
-if [ x"$TARGET" = x"release" -a -f "client/relwithdebinfo/mysql.exe" ]
-then
-  TARGET="relwithdebinfo"
-fi
-
-# ----------------------------------------------------------------------
-# Copy executables, and client DLL
-# ----------------------------------------------------------------------
+trap 'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR
 
 mkdir $DESTDIR
 mkdir $DESTDIR/bin
@@ -148,47 +139,33 @@
 cp extra/$TARGET/*.exe                         $DESTDIR/bin/
 cp myisam/$TARGET/*.exe                        $DESTDIR/bin/
 cp server-tools/instance-manager/$TARGET/*.exe $DESTDIR/bin/
-cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/ || true
-cp server-tools/instance-manager/$TARGET/*.map $DESTDIR/bin/ || true
 cp tests/$TARGET/*.exe                         $DESTDIR/bin/
+cp libmysql/$TARGET/*.exe                      $DESTDIR/bin/
 cp libmysql/$TARGET/libmysql.dll               $DESTDIR/bin/
 
 # FIXME really needed?!
 mv $DESTDIR/bin/comp_err.exe             $DESTDIR/bin/comp-err.exe
 
-if [ -f "sql/$TARGET/mysqld-nt.exe" ] ; then
-  BASENAME="mysqld-nt"     # Old style non CMake build 
-else
-  BASENAME="mysqld"        # New style CMake build
-fi
-
-# Depending on Visual Studio target, the optimized server has symbols
-cp sql/$TARGET/$BASENAME.exe   $DESTDIR/bin/$BASENAME$EXE_SUFFIX.exe
-cp sql/$TARGET/$BASENAME.pdb   $DESTDIR/bin/$BASENAME$EXE_SUFFIX.pdb || true
-cp sql/$TARGET/$BASENAME.map   $DESTDIR/bin/$BASENAME$EXE_SUFFIX.map || true
-
-if [ -f "sql/debug/mysqld-debug.exe" ] ; then
-  BASENAME="mysqld-debug"  # Old style non CMake build 
-else
-  BASENAME="mysqld"        # New style CMake build
-fi
+cp sql/$TARGET/mysqld.exe                $DESTDIR/bin/mysqld$EXE_SUFFIX.exe
+cp sql/$TARGET/mysqld.pdb                $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb || true
+cp sql/$TARGET/mysqld.map                $DESTDIR/bin/mysqld$EXE_SUFFIX.map || true
 
-if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/$BASENAME.exe" -o \
+if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/mysqld.exe" -o \
      x"$PACK_DEBUG" = x"yes" ] ; then
-  cp sql/debug/$BASENAME.exe   $DESTDIR/bin/mysqld-debug.exe
-  cp sql/debug/$BASENAME.pdb   $DESTDIR/bin/mysqld-debug.pdb || true
-  cp sql/debug/$BASENAME.map   $DESTDIR/bin/mysqld-debug.map || true
+  cp sql/debug/mysqld.exe                $DESTDIR/bin/mysqld-debug.exe
+  cp sql/debug/mysqld.pdb                $DESTDIR/bin/mysqld-debug.pdb
+  cp sql/debug/mysqld.map                $DESTDIR/bin/mysqld-debug.map
 fi
 
 # ----------------------------------------------------------------------
 # Copy data directory, readme files etc
 # ----------------------------------------------------------------------
 
+cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
+
 # FIXME is there ever a data directory to copy?
 if [ -d win/data ] ; then
-  cp -pR win/data $DESTDIR/
-elif [ -d data ] ; then
-  cp -pR data $DESTDIR/
+  cp -pR win/data $DESTDIR/data
 fi
 
 # FIXME maybe a flag to define "release build", or do the
@@ -199,13 +176,9 @@
 cp Docs/INSTALL-BINARY    $DESTDIR/Docs/
 cp Docs/manual.chm        $DESTDIR/Docs/ || /bin/true
 cp ChangeLog              $DESTDIR/Docs/ || /bin/true
+cp COPYING                $DESTDIR/Docs/
 cp support-files/my-*.ini $DESTDIR/
 
-if [ -f COPYING ] ; then
-  cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
-  cp COPYING                   $DESTDIR/Docs/
-fi
-
 # ----------------------------------------------------------------------
 # These will be filled in when we enable embedded. Note that if no
 # argument is given, it is copied if exists, else a check is done.
@@ -214,8 +187,7 @@
 copy_embedded()
 {
   mkdir -p $DESTDIR/Embedded/DLL/release \
-           $DESTDIR/Embedded/static/release \
-           $DESTDIR/include
+           $DESTDIR/Embedded/static/release
   cp libmysqld/libmysqld.def           $DESTDIR/include/
   cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
   cp libmysqld/$TARGET/libmysqld.dll   $DESTDIR/Embedded/DLL/release/
@@ -239,6 +211,24 @@
 fi
 
 # ----------------------------------------------------------------------
+# FIXME test stuff that is useless garbage?
+# ----------------------------------------------------------------------
+
+mkdir -p $DESTDIR/examples/libmysqltest/release
+cp libmysql/mytest.c libmysql/myTest.vcproj libmysql/$TARGET/myTest.exe \
+   $DESTDIR/examples/libmysqltest/
+cp libmysql/$TARGET/myTest.exe $DESTDIR/examples/libmysqltest/release/
+
+if [ x"$PACK_DEBUG" = "" -a -f "libmysql/debug/myTest.exe" -o \
+     x"$PACK_DEBUG" = "yes" ] ; then
+  mkdir -p $DESTDIR/examples/libmysqltest/debug
+  cp libmysql/debug/myTest.exe $DESTDIR/examples/libmysqltest/debug/
+fi
+
+mkdir -p $DESTDIR/examples/tests
+cp tests/*.res tests/*.tst tests/*.pl tests/*.c $DESTDIR/examples/tests/
+
+# ----------------------------------------------------------------------
 # FIXME why not copy it all in "include"?!
 # ----------------------------------------------------------------------
 
@@ -255,7 +245,6 @@
    include/m_string.h \
    include/m_ctype.h \
    include/my_global.h \
-   include/raid.h \
    include/typelib.h $DESTDIR/include/
 cp libmysql/libmysql.def $DESTDIR/include/
 
@@ -278,23 +267,14 @@
   cp libmysql/debug/libmysql.dll \
      libmysql/debug/libmysql.lib \
      client/debug/mysqlclient.lib \
+     mysys/debug/mysys.lib \
      regex/debug/regex.lib \
      strings/debug/strings.lib \
      zlib/debug/zlib.lib $DESTDIR/lib/debug/
-
-  if [ -f "mysys/debug/mysys-nt.lib" ] ; then
-    cp mysys/debug/mysys-nt.lib $DESTDIR/lib/debug/
-  else
-    cp mysys/debug/mysys.lib $DESTDIR/lib/debug/mysys-nt.lib
-  fi
-
 fi
 
-if [ -f "mysys/$TARGET/mysys-nt.lib" ] ; then
-  cp mysys/$TARGET/mysys-nt.lib $DESTDIR/lib/opt/
-else
-  cp mysys/$TARGET/mysys.lib $DESTDIR/lib/opt/mysys-nt.lib
-fi
+# FIXME sort this out...
+cp mysys/$TARGET/mysys.lib $DESTDIR/lib/opt/mysys_tls.lib
 
 # ----------------------------------------------------------------------
 # Copy the test directory
@@ -307,9 +287,7 @@
 cp mysql-test/README $DESTDIR/mysql-test/
 cp mysql-test/install_test_db.sh $DESTDIR/mysql-test/install_test_db
 cp mysql-test/include/*.inc $DESTDIR/mysql-test/include/
-cp mysql-test/include/*.test $DESTDIR/mysql-test/include/
 cp mysql-test/lib/*.pl $DESTDIR/mysql-test/lib/
-cp mysql-test/lib/*.sql $DESTDIR/mysql-test/lib/ || true
 cp mysql-test/r/*.require $DESTDIR/mysql-test/r/
 # Need this trick, or we get "argument list too long".
 ABS_DST=`pwd`/$DESTDIR
@@ -352,16 +330,9 @@
   fi; \
 done
 
-if [ -d "share" ] ; then
-  cp -pR share $DESTDIR/
-else
-  cp -pR sql/share $DESTDIR/
-fi
+cp -pR sql/share $DESTDIR/
 cp -pR sql-bench $DESTDIR/
 rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile*
-
-# The SQL initialisation code is really expected to be in "share"
-mv $DESTDIR/scripts/*.sql $DESTDIR/share/ || true
 
 # ----------------------------------------------------------------------
 # Copy other files specified on command line DEST=SOURCE