merge

2010-11-29 21:10:05 -06:00 · 2010-11-29 21:10:05 -06:00 · f688713905
commit f688713905
parent e199c7cd17 2551fff8b2
15 changed files with 21 additions and 27 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -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 \
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@ -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
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@ -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
--- a/libmysql/conf_to_src.c
+++ b/libmysql/conf_to_src.c
@ -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
--- a/libmysql/dll.c
+++ b/libmysql/dll.c
@ -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
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@ -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
--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@ -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
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@ -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
--- a/libmysql/manager.c
+++ b/libmysql/manager.c
@ -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
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@ -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
--- a/mysql-test/collections/default.push
+++ b/mysql-test/collections/default.push
@ -1,2 +1,2 @@
-perl mysql-test-run.pl --timer --force --comment=n_stm
-perl mysql-test-run.pl --timer --force --comment=ps_stm --ps-protocol
+perl mysql-test-run.pl --timer --force --vardir=var-n_stm --comment=n_stm
+perl mysql-test-run.pl --timer --force --vardir=var-ps_stm --comment=ps_stm --ps-protocol
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@ -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 \
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@ -200,8 +200,8 @@ cp ChangeLog              $DESTDIR/Docs/ || /bin/true
 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

 # ----------------------------------------------------------------------
--- a/scripts/make_win_src_distribution_old.sh
+++ b/scripts/make_win_src_distribution_old.sh
@ -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 \
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@ -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 <alexander.nozdrin@oracle.com>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
+
 * Mon Feb 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>

 - Formatting changes: