diff options
| author | unknown <timour@askmonty.org> | 2012-11-06 11:52:55 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-11-06 11:52:55 +0200 |
| commit | 7c23d6d0c66cb3b84cb466f956e19bfea0acc342 (patch) | |
| tree | 551dd23a43a26923a6dd30096a2822a27a90f355 /support-files | |
| parent | 43293b7a515dbb2cf04907e2d98bcc813279cad8 (diff) | |
| parent | 813b661d00123e3291530d102e2b94388f42fb0f (diff) | |
| download | mariadb-git-7c23d6d0c66cb3b84cb466f956e19bfea0acc342.tar.gz | |
Merge MySQL 5.1.66 -> MariaDB 5.1.65
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index c3cdad5d418..751c8a7a06b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -390,7 +390,7 @@ CXXFLAGS=${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rt # Evaluate current setting of $DEBUG if [ $DEBUG -gt 0 ] ; then OPT_COMMENT='--with-comment="%{debug_comment}"' - OPT_DEBUG='--with-debug' + OPT_DEBUG='--with-debug --enable-mysql-maintainer-mode=no' CFLAGS=`echo " $CFLAGS " | \ sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \ -e 's/^ //' -e 's/ $//'` @@ -1226,6 +1226,11 @@ fi # merging BK trees) ############################################################################## %changelog +* Tue Sep 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com> + +- Disable "maintainer mode" in debug builds, there is a cast ulonglong -> int + in the sources (since 2007) that would cause builds to fail. + * Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com> - Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace |