#At file:///net/helheim/store/bteam/bzr/mysql-6.0.9-alpha-release/
2720 Jonathan Perkin 2009-01-02 [merge]
Merge from mysql-6.0.8-alpha-release
modified:
Makefile.am
storage/myisam/myisam_backup_engine.cc
support-files/mysql.spec.sh
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/Makefile.am 2009-01-02 16:21:03 +0000
@@ -178,8 +178,8 @@ test-bt:
fi
-if [ -d mysql-test/suite/nist ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
@PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
- @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
fi
-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
=== modified file 'storage/myisam/myisam_backup_engine.cc'
--- a/storage/myisam/myisam_backup_engine.cc 2008-08-11 16:06:30 +0000
+++ b/storage/myisam/myisam_backup_engine.cc 2008-11-02 23:38:05 +0000
@@ -257,6 +257,9 @@ private:
size_t bytes_since_last_sleep; ///< how many bytes sent since we last slept
};
+/* Needed for VisualAge 6.0 */
+const size_t Backup::bytes_between_sleeps;
+
/**
When we send a backup packet to the backup kernel, we prefix it with a code
which tells which type of file this packet belongs to. Starts at 1 because
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2008-12-13 20:48:00 +0000
+++ b/support-files/mysql.spec.sh 2009-01-02 16:21:03 +0000
@@ -31,10 +31,14 @@
%{?_with_yassl:%define YASSL_BUILD 1}
%{!?_with_yassl:%define YASSL_BUILD 0}
-# use "rpmbuild --with maria" or "rpm --define '_with_maria 1'" (for RPM 3.x)
-# to build with maria support (off by default)
-%{?_with_maria:%define MARIA_BUILD 1}
-%{!?_with_maria:%define MARIA_BUILD 0}
+# use "rpmbuild --with falcon" or "rpm --define '_with_falcon 1'" (for RPM 3.x)
+# to build with falcon support (off by default)
+#
+# Note: No default --with-falcon, as generic RPM is compiled with gcc 3.x.
+# Falcon requires gcc 4.x that requires libstdc++.6 that is not on most
+# "older" Linux systems.
+%{?_with_falcon:%define FALCON_BUILD 1}
+%{!?_with_falcon:%define FALCON_BUILD 0}
# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM 3.x)
# to build with cluster support (off by default)
@@ -279,30 +283,37 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH
--prefix=/ \
--with-extra-charsets=all \
%if %{YASSL_BUILD}
- --with-ssl \
+ --with-ssl \
%endif
- --exec-prefix=%{_exec_prefix} \
- --libexecdir=%{_sbindir} \
- --libdir=%{_libdir} \
- --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} \
- --localstatedir=%{mysqldatadir} \
- --infodir=%{_infodir} \
- --includedir=%{_includedir} \
- --mandir=%{_mandir} \
- --enable-thread-safe-client \
- --with-readline \
+ --exec-prefix=%{_exec_prefix} \
+ --libexecdir=%{_sbindir} \
+ --libdir=%{_libdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} \
+ --localstatedir=%{mysqldatadir} \
+ --infodir=%{_infodir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --enable-thread-safe-client \
+ --with-readline \
--with-innodb \
%if %{CLUSTER_BUILD}
--with-ndbcluster \
%else
--without-ndbcluster \
%endif
- --with-archive-storage-engine \
- --with-csv-storage-engine \
- --with-blackhole-storage-engine \
- --with-federated-storage-engine \
- --with-partition \
+ --with-plugin-archive \
+ --with-plugin-csv \
+ --with-plugin-blackhole \
+ --with-plugin-federated \
+%if %{FALCON_BUILD}
+ --with-plugin-falcon \
+%else
+ --without-plugin-falcon \
+%endif
+ --with-plugin-maria \
+ --with-maria-tmp-tables \
+ --with-plugin-partition \
--with-big-tables \
--enable-shared \
"
@@ -367,27 +378,6 @@ CFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
BuildMySQL "\
--with-debug \
- --with-innodb \
-%if %{CLUSTER_BUILD}
- --with-ndbcluster \
-%else
- --without-ndbcluster \
-%endif
- --with-archive-storage-engine \
- --with-csv-storage-engine \
- --with-blackhole-storage-engine \
- --with-federated-storage-engine \
-%ifarch i386 x86_64
- --with-falcon \
-%else
- --without-falcon \
-%endif
-%if %{MARIA_BUILD}
- --with-plugin-maria \
- --with-maria-tmp-tables \
-%endif
- --with-partition \
- --with-big-tables \
--with-comment=\"MySQL Community Server - Debug (GPL)\"")
# We might want to save the config log file
@@ -407,29 +397,8 @@ fi
(cd mysql-release-%{mysql_version} &&
CFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
-BuildMySQL "--enable-shared \
- --with-innodb \
-%if %{CLUSTER_BUILD}
- --with-ndbcluster \
-%else
- --without-ndbcluster \
-%endif
- --with-archive-storage-engine \
- --with-csv-storage-engine \
- --with-blackhole-storage-engine \
- --with-federated-storage-engine \
-%ifarch i386 x86_64
- --with-falcon \
-%else
- --without-falcon \
-%endif
-%if %{MARIA_BUILD}
- --with-plugin-maria \
- --with-maria-tmp-tables \
-%endif
- --with-partition \
+BuildMySQL "\
--with-embedded-server \
- --with-big-tables \
--with-comment=\"MySQL Community Server (GPL)\"")
# We might want to save the config log file
if test -n "$MYSQL_CONFLOG_DEST"
@@ -890,16 +859,23 @@ fi
- Correct yesterday's fix, so that it also works for the last flag,
and fix a wrong quoting: un-quoted quote marks must not be escaped.
-* Thu Nov 06 2008 Kent Boortz <kent.boortz@stripped>
-
-- Removed "mysql_upgrade_shell"
-- Removed some copy/paste between debug and normal build
-
* Thu Nov 06 2008 Joerg Bruehe <joerg@stripped>
- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
This should cover both gcc and icc flags. Fixes bug#40546.
+* Mon Nov 03 2008 Kent Boortz <kent.boortz@stripped>
+
+- Added option --with-falcon
+- Removed option --with-maria, enabled by default
+- Use same way of defining what engines/plugins to use
+- Remove some copy/paste between debug and normal build
+
+* Sat Nov 01 2008 Kent Boortz <kent.boortz@stripped>
+
+- Removed "mysql_upgrade_shell"
+- Enabled falcon storage engine for IA64
+
* Fri Aug 29 2008 Kent Boortz <kent@stripped>
- Removed the "Federated" storage engine option, and enabled in all
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (jperkin:2720) | Jonathan Perkin | 2 Jan |
