From 644dcbf256de1150a49891d12a3a79e642c439aa Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Oct 2006 00:57:08 +0200 Subject: [PATCH 1/5] 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 scripts/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 71fee03efe804e5000195cbc33e9d1c4ed5e62c0 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Oct 2006 01:22:16 +0200 Subject: [PATCH 2/5] configure.in: Raised version number to 5.0.28 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 69c7200219dd2010de7ca33d89432aff4fbd9e3a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Oct 2006 10:57:17 +0200 Subject: [PATCH 3/5] 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 ? From 83ebd23ee9dd23c347787f1895d06e760e123a77 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Oct 2006 18:51:50 -0600 Subject: [PATCH 4/5] BitKeeper/triggers/*crash-protect.pl: Don't print messages if nothing is wrong. BitKeeper/triggers/pre-outgoing.crash-protect.pl: Don't print message if nothing is wrong. BitKeeper/triggers/pre-resolve.crash-protect.pl: Don't print message if nothing is wrong. --- BitKeeper/triggers/pre-outgoing.crash-protect.pl | 4 ---- BitKeeper/triggers/pre-resolve.crash-protect.pl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/BitKeeper/triggers/pre-outgoing.crash-protect.pl b/BitKeeper/triggers/pre-outgoing.crash-protect.pl index bbaa092e335..80567012c0f 100755 --- a/BitKeeper/triggers/pre-outgoing.crash-protect.pl +++ b/BitKeeper/triggers/pre-outgoing.crash-protect.pl @@ -9,8 +9,6 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || exit 0; } -print "Checking for bad changesets from old crashed 5.1 tree...\n"; - my @bad_csets= ( 'monty@mysql.com|ChangeSet|20060418090255|16983', 'monty@mysql.com|ChangeSet|20060418090458|02628', @@ -80,6 +78,4 @@ END } } -print "No bad changesets found, proceeding.\n"; - exit 0; diff --git a/BitKeeper/triggers/pre-resolve.crash-protect.pl b/BitKeeper/triggers/pre-resolve.crash-protect.pl index bbaa092e335..80567012c0f 100755 --- a/BitKeeper/triggers/pre-resolve.crash-protect.pl +++ b/BitKeeper/triggers/pre-resolve.crash-protect.pl @@ -9,8 +9,6 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || exit 0; } -print "Checking for bad changesets from old crashed 5.1 tree...\n"; - my @bad_csets= ( 'monty@mysql.com|ChangeSet|20060418090255|16983', 'monty@mysql.com|ChangeSet|20060418090458|02628', @@ -80,6 +78,4 @@ END } } -print "No bad changesets found, proceeding.\n"; - exit 0; From b4649198da93c0edebbdf21abfa2e156b24bbd2e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Oct 2006 15:41:47 -0400 Subject: [PATCH 5/5] Post Merge Cleanup --- storage/innobase/include/univ.i | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 8765987d472..f471fe136b0 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -40,12 +40,21 @@ if we are compiling on Windows. */ # undef VERSION /* Include the header file generated by GNU autoconf */ +#ifndef __WIN__ # include "config.h" +#endif # ifdef HAVE_SCHED_H # include # endif +/* When compiling for Itanium IA64, undefine the flag below to prevent use +of the 32-bit x86 assembler in mutex operations. */ + +#if defined(__WIN__) && !defined(WIN64) && !defined(_WIN64) +#define UNIV_CAN_USE_X86_ASSEMBLER +#endif + /* We only try to do explicit inlining of functions with gcc and Microsoft Visual C++ */