From: Alexander Nozdrin Date: November 24 2010 10:24am Subject: bzr commit into mysql-5.5-bugteam branch (alexander.nozdrin:3136) List-Archive: http://lists.mysql.com/commits/124830 Message-Id: <201011241024.oAO3R9w6023579@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/alik/MySQL/bzr/mysql-5.5-bugteam/ based on revid:sergey.glukhov@stripped 3136 Alexander Nozdrin 2010-11-24 [merge] Merge from mysql-5.1-bugteam. modified: CMakeLists.txt libmysql/conf_to_src.c libmysql/errmsg.c libmysql/get_password.c libmysql/libmysql.c scripts/make_binary_distribution.sh scripts/make_win_bin_dist support-files/mysql.spec.sh === modified file 'CMakeLists.txt' --- a/CMakeLists.txt 2010-11-19 13:56:08 +0000 +++ b/CMakeLists.txt 2010-11-24 10:23:44 +0000 @@ -344,7 +344,7 @@ ENDIF() # RPM installs documentation directly from the source tree # IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql + INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme OPTIONAL === modified file 'libmysql/conf_to_src.c' --- a/libmysql/conf_to_src.c 2004-08-18 17:57:55 +0000 +++ b/libmysql/conf_to_src.c 2010-11-24 09:53:39 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. 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 - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/errmsg.c' --- a/libmysql/errmsg.c 2010-08-09 08:32:50 +0000 +++ b/libmysql/errmsg.c 2010-11-24 10:23:44 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. 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 - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/get_password.c' --- a/libmysql/get_password.c 2010-07-15 11:13:30 +0000 +++ b/libmysql/get_password.c 2010-11-24 10:23:44 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. 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 - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/libmysql.c' --- a/libmysql/libmysql.c 2010-11-16 09:45:07 +0000 +++ b/libmysql/libmysql.c 2010-11-24 10:23:44 +0000 @@ -5,8 +5,7 @@ the Free Software Foundation. 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 - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'scripts/make_binary_distribution.sh' --- a/scripts/make_binary_distribution.sh 2010-07-15 13:47:50 +0000 +++ b/scripts/make_binary_distribution.sh 2010-11-24 10:23:44 +0000 @@ -304,8 +304,8 @@ mv $DEST/bin/mysql_install_db $DEST/scri # Copy readme and license files cp README Docs/INSTALL-BINARY $DEST/ -if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then - cp COPYING EXCEPTIONS-CLIENT $DEST/ +if [ -f COPYING ] ; then + cp COPYING $DEST/ elif [ -f LICENSE.mysql ] ; then cp LICENSE.mysql $DEST/ else === modified file 'scripts/make_win_bin_dist' --- a/scripts/make_win_bin_dist 2010-09-29 14:26:32 +0000 +++ b/scripts/make_win_bin_dist 2010-11-24 10:23:44 +0000 @@ -183,8 +183,8 @@ cp ChangeLog $DESTDIR/Docs/ cp support-files/my-*.ini $DESTDIR/ if [ -f COPYING ] ; then - cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ - cp COPYING $DESTDIR/Docs/ + cp COPYING $DESTDIR/ + cp COPYING $DESTDIR/Docs/ fi # ---------------------------------------------------------------------- === modified file 'support-files/mysql.spec.sh' --- a/support-files/mysql.spec.sh 2010-11-20 14:47:50 +0000 +++ b/support-files/mysql.spec.sh 2010-11-24 10:23:44 +0000 @@ -211,7 +211,6 @@ %define license_files_server %{src_dir}/LICENSE.mysql %define license_type Commercial %else -%define license_files_devel %{src_dir}/EXCEPTIONS-CLIENT %define license_files_server %{src_dir}/COPYING %{src_dir}/README %define license_type GPL %endif @@ -1037,9 +1036,6 @@ echo "=====" # ---------------------------------------------------------------------------- %files -n MySQL-devel%{product_suffix} -f optional-files-devel %defattr(-, root, root, 0755) -%if %{defined license_files_devel} -%doc %{license_files_devel} -%endif %doc %attr(644, root, man) %{_mandir}/man1/comp_err.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* %attr(755, root, root) %{_bindir}/mysql_config @@ -1099,6 +1095,10 @@ echo "=====" - 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". +* Wed Nov 24 2010 Alexander Nozdrin + +- EXCEPTIONS-CLIENT has been deleted, remove it from here too. + * Tue Jun 15 2010 Joerg Bruehe - Change the behaviour on installation and upgrade: No bundle (reason: revision is a merge).