Commit 56f3f224 authored by Alexander Nozdrin's avatar Alexander Nozdrin

Merge from mysql-5.5-bugteam.

parents 222dd6e1 7a3636c1
...@@ -344,7 +344,7 @@ ENDIF() ...@@ -344,7 +344,7 @@ ENDIF()
# RPM installs documentation directly from the source tree # RPM installs documentation directly from the source tree
# #
IF(NOT INSTALL_LAYOUT MATCHES "RPM") IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR} DESTINATION ${INSTALL_DOCREADMEDIR}
COMPONENT Readme COMPONENT Readme
OPTIONAL OPTIONAL
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
......
...@@ -304,8 +304,8 @@ mv $DEST/bin/mysql_install_db $DEST/scripts/ ...@@ -304,8 +304,8 @@ mv $DEST/bin/mysql_install_db $DEST/scripts/
# Copy readme and license files # Copy readme and license files
cp README Docs/INSTALL-BINARY $DEST/ cp README Docs/INSTALL-BINARY $DEST/
if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then if [ -f COPYING ] ; then
cp COPYING EXCEPTIONS-CLIENT $DEST/ cp COPYING $DEST/
elif [ -f LICENSE.mysql ] ; then elif [ -f LICENSE.mysql ] ; then
cp LICENSE.mysql $DEST/ cp LICENSE.mysql $DEST/
else else
......
...@@ -183,7 +183,7 @@ cp ChangeLog $DESTDIR/Docs/ || /bin/true ...@@ -183,7 +183,7 @@ cp ChangeLog $DESTDIR/Docs/ || /bin/true
cp support-files/my-*.ini $DESTDIR/ cp support-files/my-*.ini $DESTDIR/
if [ -f COPYING ] ; then if [ -f COPYING ] ; then
cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ cp COPYING $DESTDIR/
cp COPYING $DESTDIR/Docs/ cp COPYING $DESTDIR/Docs/
fi fi
......
...@@ -1106,6 +1106,10 @@ echo "=====" >> $STATUS_HISTORY ...@@ -1106,6 +1106,10 @@ echo "=====" >> $STATUS_HISTORY
- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM. - Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade". - This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
* Wed Nov 24 2010 Alexander Nozdrin <alexander.nozdrin@oracle.com>
- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com> * Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Change the behaviour on installation and upgrade: - Change the behaviour on installation and upgrade:
......
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