List:Commits« Previous MessageNext Message »
From:msvensson Date:February 28 2007 7:45pm
Subject:bk commit into 5.1 tree (msvensson:1.2480)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-02-28 20:45:07+01:00, msvensson@stripped +2 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2372.132

  BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2007-02-28 20:45:04+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.1.6.2

  BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2007-02-28 20:45:04+01:00, msvensson@stripped +0 -0
    Merge rename: scripts/make_win_bin_dist -> BitKeeper/deleted/.del-make_win_bin_dist

  scripts/make_binary_distribution.sh@stripped, 2007-02-28 20:45:04+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.101.1.20

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.142/scripts/make_binary_distribution.sh	2007-02-12 23:37:09 +01:00
+++ 1.143/scripts/make_binary_distribution.sh	2007-02-28 20:45:04 +01:00
@@ -254,7 +254,6 @@ copyfileto $BASE/mysql-test \
          netware/mysql_test_run.nlm netware/install_test_db.ncf
 
 $CP mysql-test/lib/*.pl  $BASE/mysql-test/lib
-$CP mysql-test/lib/*.sql $BASE/mysql-test/lib
 $CP mysql-test/t/*.def $BASE/mysql-test/t
 $CP mysql-test/include/*.inc $BASE/mysql-test/include
 $CP mysql-test/include/*.test $BASE/mysql-test/include

--- 1.1.6.1/scripts/make_win_bin_dist	2007-02-28 20:44:48 +01:00
+++ 1.8/BitKeeper/deleted/.del-make_win_bin_dist	2007-02-28 20:45:04 +01:00
@@ -158,6 +158,8 @@ 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/data
@@ -171,13 +173,9 @@ mkdir $DESTDIR/Docs
 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.
@@ -186,8 +184,7 @@ fi
 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/
@@ -228,9 +225,6 @@ fi
 mkdir -p $DESTDIR/examples/tests
 cp tests/*.res tests/*.tst tests/*.pl tests/*.c $DESTDIR/examples/tests/
 
-mkdir -p $DESTDIR/examples/udf_example
-cp sql/udf_example.def sql/udf_example.vcproj sql/udf_example.c $DESTDIR/examples/udf_example/
-
 # ----------------------------------------------------------------------
 # FIXME why not copy it all in "include"?!
 # ----------------------------------------------------------------------
@@ -248,7 +242,6 @@ cp include/conf*.h \
    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/
 
Thread
bk commit into 5.1 tree (msvensson:1.2480)msvensson28 Feb