database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge second fix for bug#40546 to the 5.1.30 tree.

Browse Source
This commit is contained in:
Joerg Bruehe
2008-11-07 20:08:37 +01:00
parent 2f08a0798d d74ce24d8d
commit 6fc34d0a0d
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
support-files/mysql.spec.sh
View File

@ -341,13 +341,17 @@ CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-except
( (
# We are in a subshell, so we can modify variables just for one run. # We are in a subshell, so we can modify variables just for one run.
CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'` CFLAGS=`echo " $CFLAGS " | \
CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'` sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
-e 's/^ //' -e 's/ $//'`
CXXFLAGS=`echo " $CXXFLAGS " | \
sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
-e 's/^ //' -e 's/ $//'`
# Add -g and --with-debug. # Add -g and --with-debug.
cd mysql-debug-%{mysql_version} && cd mysql-debug-%{mysql_version} &&
CFLAGS=\"$CFLAGS\" \ CFLAGS="$CFLAGS" \
CXXFLAGS=\"$CXXFLAGS\" \ CXXFLAGS="$CXXFLAGS" \
BuildMySQL "\ BuildMySQL "\
--with-debug \ --with-debug \
--with-comment=\"MySQL Community Server - Debug (GPL)\"") --with-comment=\"MySQL Community Server - Debug (GPL)\"")
@ -367,8 +371,8 @@ fi
############################################################################## ##############################################################################
(cd mysql-release-%{mysql_version} && (cd mysql-release-%{mysql_version} &&
CFLAGS=\"$CFLAGS\" \ CFLAGS="$CFLAGS" \
CXXFLAGS=\"$CXXFLAGS\" \ CXXFLAGS="$CXXFLAGS" \
BuildMySQL "\ BuildMySQL "\
--with-embedded-server \ --with-embedded-server \
--with-comment=\"MySQL Community Server (GPL)\"") --with-comment=\"MySQL Community Server (GPL)\"")
@ -830,6 +834,11 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
- 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@sun.com> * Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
- Removed "mysql_upgrade_shell" - Removed "mysql_upgrade_shell"