#At file:///net/helheim/store/bteam/bzr/mysql-5.1.30-release/
2773 kent.boortz@stripped 2008-11-06
Back merges from 6.0.8
- Removed some copy/paste between debug and normal build in RPM spec
- Removed "mysql_upgrade_shell" from RPM build
- Removed use of "grep -q" in "configure.in", not portable
- Improved test to disable ABI check not to accidently run for icc
Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
modified:
Makefile.am
config/ac-macros/ha_ndbcluster.m4
configure.in
support-files/mysql.spec.sh
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-09-04 11:53:16 +0000
+++ b/Makefile.am 2008-11-06 18:38:19 +0000
@@ -159,6 +159,8 @@ test-bt:
@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
-if [ -d mysql-test/suite/nist ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
@@ -175,14 +177,27 @@ test-bt:
echo "no program found for 'embedded' tests - skipped testing" ; \
fi
-# Re-enable the "jp" suite when bug#28563 is fixed
-# -cd mysql-test ; MTR_BUILD_THREAD=auto \
-# @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
+test-bt-fast:
+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --comment=ps --force --timer \
+ --skip-ndbcluster --ps-protocol
+ -if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
+ cd mysql-test ; \
+ MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
+ --with-ndbcluster-only ; \
+ else \
+ echo "no program found for 'ndbcluster' tests - skipped testing" ; \
+ fi
+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
test-bt-debug:
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=debug --force --timer \
--skip-ndbcluster --skip-rpl --report-features
+
+test-bt-debug-fast:
# Keep these for a while
test-pl: test
=== modified file 'config/ac-macros/ha_ndbcluster.m4'
--- a/config/ac-macros/ha_ndbcluster.m4 2008-02-26 17:43:48 +0000
+++ b/config/ac-macros/ha_ndbcluster.m4 2008-11-06 18:38:19 +0000
@@ -280,7 +280,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
esac
# libndbclient versioning when linked with GNU ld.
- if $LD --version 2>/dev/null|grep -q GNU; then
+ if $LD --version 2>/dev/null|grep GNU >/dev/null 2>&1 ; then
NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"
AC_CONFIG_FILES(storage/ndb/src/libndb.ver)
fi
=== modified file 'configure.in'
--- a/configure.in 2008-11-04 12:44:19 +0000
+++ b/configure.in 2008-11-06 18:38:19 +0000
@@ -377,7 +377,7 @@ fi
MYSQL_PROG_AR
# libmysqlclient versioning when linked with GNU ld.
-if $LD --version 2>/dev/null|grep -q GNU; then
+if $LD --version 2>/dev/null| grep GNU >/dev/null 2>&1; then
LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
AC_CONFIG_FILES(libmysql/libmysql.ver)
fi
@@ -449,11 +449,11 @@ AC_SUBST(PERL5)
# Enable the abi_check rule only if gcc is available
-if expr "$CC" : ".*gcc.*"
+if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
then
- ABI_CHECK="abi_check"
-else
ABI_CHECK=""
+else
+ ABI_CHECK="abi_check"
fi
AC_SUBST(ABI_CHECK)
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2008-11-06 16:09:14 +0000
+++ b/support-files/mysql.spec.sh 2008-11-06 18:38:19 +0000
@@ -279,7 +279,20 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH
--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-big-tables \
+ --enable-shared \
+ "
make
}
@@ -306,6 +319,8 @@ mkdir -p $RBR%{_libdir}/mysql
PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin}
export PATH
+# Build the Debug binary.
+
# Use gcc for C and C++ code (to avoid a dependency on libstdc++ and
# including exceptions into the code
if [ -z "$CXX" -a -z "$CC" ]
@@ -333,20 +348,8 @@ CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[
cd mysql-debug-%{mysql_version} &&
CFLAGS=\"$CFLAGS\" \
CXXFLAGS=\"$CXXFLAGS\" \
-BuildMySQL "--enable-shared \
+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 \
- --with-partition \
- --with-big-tables \
--with-comment=\"MySQL Community Server - Debug (GPL)\"")
# We might want to save the config log file
@@ -366,20 +369,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 \
- --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"
@@ -700,7 +691,6 @@ fi
%attr(755, root, root) %{_bindir}/msql2mysql
%attr(755, root, root) %{_bindir}/mysql
%attr(755, root, root) %{_bindir}/mysql_find_rows
-%attr(755, root, root) %{_bindir}/mysql_upgrade_shell
%attr(755, root, root) %{_bindir}/mysql_waitpid
%attr(755, root, root) %{_bindir}/mysqlaccess
%attr(755, root, root) %{_bindir}/mysqladmin
@@ -840,6 +830,11 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
+* 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.
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (kent.boortz:2773) | kent.boortz | 6 Nov |
