From 08d47a3b81424e89e39b26cc70e3d881ba86432b Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se" <>
Date: Sat, 21 Oct 2006 00:57:08 +0200
Subject: [PATCH 1/3] make_win_bin_dist:   Copy udf examples and raid.h  
 Create target "include" directory before copying files to it CMakeLists.txt: 
  Only compile in bdb if configured configure.in:   Raised version number to
 5.0.27

---
 CMakeLists.txt            |  4 +++-
 configure.in              |  4 ++--
 scripts/make_win_bin_dist | 15 +++++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd780ec6a13..f202c15c200 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,9 @@ ADD_SUBDIRECTORY(heap)
 ADD_SUBDIRECTORY(myisam)
 ADD_SUBDIRECTORY(myisammrg)
 ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(bdb)
+IF(WITH_BERKELEY_STORAGE_ENGINE)
+  ADD_SUBDIRECTORY(bdb)
+ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
 ADD_SUBDIRECTORY(innobase)
 ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(sql/examples)
diff --git a/configure.in b/configure.in
index 7bc4fe77675..55da1dfb241 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.26)
+AM_INIT_AUTOMAKE(mysql, 5.0.27)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=26
+NDB_VERSION_BUILD=27
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index cc75245e5d9..38e7ab88f22 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -144,8 +144,6 @@ 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
@@ -159,9 +157,13 @@ 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.
@@ -170,7 +172,8 @@ cp support-files/my-*.ini $DESTDIR/
 copy_embedded()
 {
   mkdir -p $DESTDIR/Embedded/DLL/release \
-           $DESTDIR/Embedded/static/release
+           $DESTDIR/Embedded/static/release \
+           $DESTDIR/include
   cp libmysqld/libmysqld.def           $DESTDIR/include/
   cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
   cp libmysqld/$TARGET/libmysqld.dll   $DESTDIR/Embedded/DLL/release/
@@ -211,6 +214,9 @@ 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"?!
 # ----------------------------------------------------------------------
@@ -228,6 +234,7 @@ 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/
 

From 5f12986d7d36ff3207e8bfa6e5c3539324d4f8cd Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se" <>
Date: Sat, 21 Oct 2006 01:22:16 +0200
Subject: [PATCH 2/3] configure.in:   Raised version number to 5.0.28

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 55da1dfb241..18c08722fff 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.27)
+AM_INIT_AUTOMAKE(mysql, 5.0.28)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=27
+NDB_VERSION_BUILD=28
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

From 837746340e890fb65a9606f26988d2789db755d5 Mon Sep 17 00:00:00 2001
From: "joerg@trift2." <>
Date: Tue, 24 Oct 2006 10:57:17 +0200
Subject: [PATCH 3/3] Bump version number to 5.0.29, as 28 will be based
 directly on 27.

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 18c08722fff..7c2d3e77b27 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.28)
+AM_INIT_AUTOMAKE(mysql, 5.0.29)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=28
+NDB_VERSION_BUILD=29
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?