Commit a62103aa authored by Joerg Bruehe's avatar Joerg Bruehe

Merge a polishing of an old bug fix,

more for completeness than for relevance.

Also, update copyright notices.
parents 5142e833 c81061e4
# Copyright (C) 2000-2007 MySQL AB # Copyright (C) 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -87,7 +87,7 @@ is intended for mission-critical, heavy-load production systems as well ...@@ -87,7 +87,7 @@ is intended for mission-critical, heavy-load production systems as well
as for embedding into mass-deployed software. MySQL is a trademark of as for embedding into mass-deployed software. MySQL is a trademark of
MySQL AB. MySQL AB.
Copyright (C) 2000-2007 MySQL AB Copyright (C) 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This software comes with ABSOLUTELY NO WARRANTY. This is free software, This software comes with ABSOLUTELY NO WARRANTY. This is free software,
and you are welcome to modify and redistribute it under the GPL license. and you are welcome to modify and redistribute it under the GPL license.
...@@ -109,7 +109,7 @@ is intended for mission-critical, heavy-load production systems as well ...@@ -109,7 +109,7 @@ is intended for mission-critical, heavy-load production systems as well
as for embedding into mass-deployed software. MySQL is a trademark of as for embedding into mass-deployed software. MySQL is a trademark of
MySQL AB. MySQL AB.
Copyright (C) 2000-2007 MySQL AB Copyright (C) 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This software comes with ABSOLUTELY NO WARRANTY. This is free software, This software comes with ABSOLUTELY NO WARRANTY. This is free software,
and you are welcome to modify and redistribute it under the GPL license. and you are welcome to modify and redistribute it under the GPL license.
...@@ -320,8 +320,12 @@ do ...@@ -320,8 +320,12 @@ do
# 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.
if test "$servertype" != ' ' if test "$servertype" != ' '
then then
CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'` CFLAGS=`echo " $CFLAGS " | \
CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'` 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/ $//'`
fi fi
BuildMySQL "\ BuildMySQL "\
...@@ -807,6 +811,10 @@ fi ...@@ -807,6 +811,10 @@ 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.
* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com> * Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment