Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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
1.1805 05/04/27 22:46:20 guilhem@stripped +12 -0
update of BUILD/* scripts to storage/ directory structure (they didn't work anymore)
BUILD/compile-solaris-sparc-purify
1.15 05/04/27 22:46:14 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-solaris-sparc
1.9 05/04/27 22:46:13 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-solaris-sparc-forte
1.4 05/04/27 22:46:13 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-solaris-sparc-debug
1.3 05/04/27 22:46:13 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-pentium-pgcc
1.3 05/04/27 22:46:13 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-irix-mips64-mipspro
1.3 05/04/27 22:46:13 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-ia64-debug-max
1.4 05/04/27 22:46:13 guilhem@stripped +3 -3
update to storage/ directory structure
BUILD/compile-hpux11-parisc2-aCC
1.4 05/04/27 22:46:13 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-dist
1.4 05/04/27 22:46:13 guilhem@stripped +2 -2
update to storage/ directory structure
BUILD/compile-alpha-debug
1.7 05/04/27 22:46:13 guilhem@stripped +1 -1
update to storage/ directory structure
BUILD/compile-alpha-cxx
1.9 05/04/27 22:46:13 guilhem@stripped +1 -1
update to storage/ directory structure
BUILD/FINISH.sh
1.28 05/04/27 22:46:13 guilhem@stripped +3 -3
update to storage/ directory structure
# 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: guilhem
# Host: gbichot2.local
# Root: /home/mysql_src/mysql-5.1
--- 1.6/BUILD/compile-alpha-debug 2001-11-28 02:47:15 +01:00
+++ 1.7/BUILD/compile-alpha-debug 2005-04-27 22:46:13 +02:00
@@ -1,7 +1,7 @@
/bin/rm -f */.deps/*.P */*.o
make -k clean
/bin/rm -f */.deps/*.P */*.o
-/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
aclocal; autoheader; aclocal; automake; autoconf
CFLAGS=-O1 CC=gcc CXX=gcc CXXFLAGS="-O1 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug --with-extra-charsets=complex --without-extra-tools
--- 1.14/BUILD/compile-solaris-sparc-purify 2005-02-07 13:27:39 +01:00
+++ 1.15/BUILD/compile-solaris-sparc-purify 2005-04-27 22:46:14 +02:00
@@ -34,8 +34,8 @@
gmake -k clean || true
/bin/rm -f */.deps/*.P config.cache
aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS
--- 1.8/BUILD/compile-solaris-sparc 2002-12-04 16:40:36 +01:00
+++ 1.9/BUILD/compile-solaris-sparc 2005-04-27 22:46:13 +02:00
@@ -4,8 +4,8 @@
/bin/rm -f */.deps/*.P config.cache
aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
then
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
--- 1.3/BUILD/compile-hpux11-parisc2-aCC 2004-10-14 22:36:33 +02:00
+++ 1.4/BUILD/compile-hpux11-parisc2-aCC 2005-04-27 22:46:13 +02:00
@@ -68,8 +68,8 @@
automake --force --add-missing
autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
CC=cc CXX=aCC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \
./configure --prefix=/usr/local/mysql --disable-shared \
--- 1.2/BUILD/compile-irix-mips64-mipspro 2004-07-09 12:32:11 +02:00
+++ 1.3/BUILD/compile-irix-mips64-mipspro 2005-04-27 22:46:13 +02:00
@@ -40,8 +40,8 @@
automake --force --add-missing
autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
# C options:
# -apo - auto-parallize for multiprocessors (implies -mp)
--- 1.3/BUILD/compile-dist 2005-01-06 15:32:38 +01:00
+++ 1.4/BUILD/compile-dist 2005-04-27 22:46:13 +02:00
@@ -12,8 +12,8 @@
libtoolize --automake --force --copy
automake --force --add-missing --copy
autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
# Default to gcc for CC and CXX
if test -z "$CXX" ; then
--- 1.2/BUILD/compile-solaris-sparc-debug 2002-05-21 19:35:53 +02:00
+++ 1.3/BUILD/compile-solaris-sparc-debug 2005-04-27 22:46:13 +02:00
@@ -4,8 +4,8 @@
/bin/rm -f */.deps/*.P config.cache
aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
then
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
--- 1.3/BUILD/compile-solaris-sparc-forte 2002-11-07 02:53:09 +01:00
+++ 1.4/BUILD/compile-solaris-sparc-forte 2005-04-27 22:46:13 +02:00
@@ -4,8 +4,8 @@
/bin/rm -f */.deps/*.P config.cache
aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
then
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
--- 1.8/BUILD/compile-alpha-cxx 2003-01-09 10:11:02 +01:00
+++ 1.9/BUILD/compile-alpha-cxx 2005-04-27 22:46:13 +02:00
@@ -1,7 +1,7 @@
/bin/rm -f */.deps/*.P */*.o
make -k clean
/bin/rm -f */.deps/*.P */*.o
-/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
aclocal; autoheader; aclocal; automake; autoconf
CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking
--- 1.2/BUILD/compile-pentium-pgcc 2001-10-09 18:32:53 +02:00
+++ 1.3/BUILD/compile-pentium-pgcc 2005-04-27 22:46:13 +02:00
@@ -3,8 +3,8 @@
/bin/rm -f */.deps/*.P config.cache
aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
then
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
--- 1.3/BUILD/compile-ia64-debug-max 2005-01-31 21:17:32 +01:00
+++ 1.4/BUILD/compile-ia64-debug-max 2005-04-27 22:46:13 +02:00
@@ -1,9 +1,9 @@
gmake -k clean || true
-/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache
aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
then
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
--- 1.27/BUILD/FINISH.sh 2004-11-23 15:10:07 +01:00
+++ 1.28/BUILD/FINISH.sh 2005-04-27 22:46:13 +02:00
@@ -11,15 +11,15 @@
commands="\
$make -k distclean || true
-/bin/rm -rf */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;
+/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;
aclocal || (echo \"Can't execute aclocal\" && exit 1)
autoheader || (echo \"Can't execute autoheader\" && exit 1)
aclocal || (echo \"Can't execute aclocal\" && exit 1)
automake || (echo \"Can't execute automake\" && exit 1)
autoconf || (echo \"Can't execute autoconf\" && exit 1)
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
then
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
| Thread |
|---|
| • bk commit into 5.1 tree (guilhem:1.1805) | guilhem | 27 Apr |
