1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1-bugteam.

Browse Source
This commit is contained in:
Alexander Nozdrin 2010-11-24 13:23:44 +03:00
commit 7a3636c1af
8 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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

3
libmysql/conf_to_src.c
View File

@ -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

3
libmysql/errmsg.c
View File

@ -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

3
libmysql/get_password.c
View File

@ -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

3
libmysql/libmysql.c
View File

@ -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

4
scripts/make_binary_distribution.sh
View File

@ -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

2
scripts/make_win_bin_dist
View File

@ -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

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

@ -211,7 +211,6 @@
%define license_files_server %{src_dir}/LICENSE.mysql %define license_files_server %{src_dir}/LICENSE.mysql
%define license_type Commercial %define license_type Commercial
%else %else
%define license_files_devel %{src_dir}/EXCEPTIONS-CLIENT
%define license_files_server %{src_dir}/COPYING %{src_dir}/README %define license_files_server %{src_dir}/COPYING %{src_dir}/README
%define license_type GPL %define license_type GPL
%endif %endif
@ -1037,9 +1036,6 @@ echo "=====" >> $STATUS_HISTORY
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
%files -n MySQL-devel%{product_suffix} -f optional-files-devel %files -n MySQL-devel%{product_suffix} -f optional-files-devel
%defattr(-, root, root, 0755) %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/comp_err.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
%attr(755, root, root) %{_bindir}/mysql_config %attr(755, root, root) %{_bindir}/mysql_config
@ -1099,6 +1095,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: