From: Alexander Nozdrin Date: November 24 2010 9:53am Subject: bzr commit into mysql-5.0-bugteam branch (alexander.nozdrin:2890) Bug#58340 List-Archive: http://lists.mysql.com/commits/124819 X-Bug: 58340 Message-Id: <201011240954.oAO5GRgJ025440@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1996171233789465635==" --===============1996171233789465635== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/alik/MySQL/bzr/mysql-5.0-bugteam/ based on revid:alexander.nozdrin@stripped 2890 Alexander Nozdrin 2010-11-24 A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all EXCEPTIONS-CLIENT from all the places. modified: Makefile.am libmysql/Makefile.am libmysql/Makefile.shared libmysql/conf_to_src.c libmysql/dll.c libmysql/errmsg.c libmysql/get_password.c libmysql/libmysql.c libmysql/manager.c libmysql_r/Makefile.am scripts/make_binary_distribution.sh scripts/make_win_bin_dist scripts/make_win_src_distribution_old.sh support-files/mysql.spec.sh === modified file 'Makefile.am' --- a/Makefile.am 2009-10-14 22:40:40 +0000 +++ b/Makefile.am 2010-11-24 09:53:39 +0000 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ - README COPYING EXCEPTIONS-CLIENT CMakeLists.txt + README COPYING CMakeLists.txt SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @readline_topdir@ sql-common scripts \ === modified file 'libmysql/Makefile.am' --- a/libmysql/Makefile.am 2007-11-19 15:59:25 +0000 +++ b/libmysql/Makefile.am 2010-11-24 09:53:39 +0000 @@ -5,8 +5,7 @@ # published by 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 library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'libmysql/Makefile.shared' --- a/libmysql/Makefile.shared 2009-07-31 19:22:02 +0000 +++ b/libmysql/Makefile.shared 2010-11-24 09:53:39 +0000 @@ -5,8 +5,7 @@ # published by 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 library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of === 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/dll.c' --- a/libmysql/dll.c 2008-09-01 21:46:37 +0000 +++ b/libmysql/dll.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 2006-11-23 14:41:21 +0000 +++ b/libmysql/errmsg.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/get_password.c' --- a/libmysql/get_password.c 2004-08-05 15:05:11 +0000 +++ b/libmysql/get_password.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/libmysql.c' --- a/libmysql/libmysql.c 2009-12-17 17:58:38 +0000 +++ b/libmysql/libmysql.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/manager.c' --- a/libmysql/manager.c 2009-02-10 22:47:54 +0000 +++ b/libmysql/manager.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_r/Makefile.am' --- a/libmysql_r/Makefile.am 2006-12-31 00:02:27 +0000 +++ b/libmysql_r/Makefile.am 2010-11-24 09:53:39 +0000 @@ -5,8 +5,7 @@ # published by 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 library 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-06-17 17:47:38 +0000 +++ b/scripts/make_binary_distribution.sh 2010-11-24 09:53:39 +0000 @@ -211,7 +211,7 @@ copyfileto() copyfileto $BASE/docs ChangeLog Docs/mysql.info copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \ - EXCEPTIONS-CLIENT LICENSE.mysql + LICENSE.mysql # Non platform-specific bin dir files: BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ === modified file 'scripts/make_win_bin_dist' --- a/scripts/make_win_bin_dist 2009-11-17 16:49:24 +0000 +++ b/scripts/make_win_bin_dist 2010-11-24 09:53:39 +0000 @@ -200,8 +200,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 'scripts/make_win_src_distribution_old.sh' --- a/scripts/make_win_src_distribution_old.sh 2007-08-13 22:03:05 +0000 +++ b/scripts/make_win_src_distribution_old.sh 2010-11-24 09:53:39 +0000 @@ -312,7 +312,7 @@ touch $BASE/innobase/ib_config.h # cd $SOURCE -for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\ +for i in COPYING ChangeLog README \ INSTALL-SOURCE INSTALL-WIN \ INSTALL-WIN-SOURCE \ Docs/INSTALL-BINARY Docs/manual.chm @@ -376,7 +376,7 @@ fi # Search the tree for plain text files and adapt the line end marker # find $BASE \( -name "*.cnf" -o -name "*.ini" \ - -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \ + -o -name COPYING -o -name ChangeLog \ -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \ -o -name "*.dsp" -o -name "*.dsw" \ -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \ === modified file 'support-files/mysql.spec.sh' --- a/support-files/mysql.spec.sh 2010-02-02 16:53:52 +0000 +++ b/support-files/mysql.spec.sh 2010-11-24 09:53:39 +0000 @@ -837,7 +837,6 @@ fi %files devel %defattr(-, root, root, 0755) -%doc EXCEPTIONS-CLIENT %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}/comp_err @@ -892,6 +891,10 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Wed Nov 24 2010 Alexander Nozdrin + +- EXCEPTIONS-CLIENT has been deleted, remove it from here too. + * Mon Feb 01 2010 Joerg Bruehe - Formatting changes: --===============1996171233789465635== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/alexander.nozdrin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@stripped\ # oatpqq684jpbbso2 # target_branch: file:///home/alik/MySQL/bzr/mysql-5.0-bugteam/ # testament_sha1: b554a9dc669df2608094ade7ebde059593915517 # timestamp: 2010-11-24 12:53:49 +0300 # base_revision_id: alexander.nozdrin@stripped\ # tl6m39zsfgvzi2mf # # Begin bundle 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 B5euBIScS7heMOp1GmVC//F3JFOFCQ+1xoNA --===============1996171233789465635==--