- rename: EXCEPTIONS->EXCEPTIONS-CLIENT

15 files changed, 16 insertions, 16 deletions

diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright
index 231482806ee..84e13d6041e 100755
--- a/Build-tools/mysql-copyright
+++ b/Build-tools/mysql-copyright
@@ -101,7 +101,7 @@ sub main
     # on the toplevel of the directory instead. file 'PUBLIC' shouldn't
     # exist in the new mysql distributions, but let's be sure..
     unlink("$destdir/PUBLIC", "$destdir/README");
-    unlink("$destdir/COPYING", "$destdir/EXCEPTIONS");
+    unlink("$destdir/COPYING", "$destdir/EXCEPTIONS-CLIENT");
     copy("$WD/Docs/MySQLEULA.txt", "$destdir");
     
     # remove readline subdir and update configure accordingly
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 06e4b4cfd6a..a4e8e14a38d 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
 
 all:			$(targets) txt_files
 
-txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS \
+txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
 
 CLEAN_FILES:		$(BUILD_SOURCES)
@@ -204,7 +204,7 @@ INSTALL-BINARY:	mysql.info $(GT)
 ../COPYING:		mysql.info $(GT)
 	perl -w $(GT) mysql.info "GPL license" "MySQL FLOSS License Exception" > $@
 
-../EXCEPTIONS: mysql.info $(GT)
+../EXCEPTIONS-CLIENT: mysql.info $(GT)
 	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@
 
 ../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
diff --git a/Makefile.am b/Makefile.am
index 8e524871d7a..fb0735b562c 100644
--- 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 README COPYING EXCEPTIONS
+EXTRA_DIST =		INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 SUBDIRS =		. include @docs_dirs@ @readline_dir@ \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ scripts man tests \
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index 1d80aae8e5c..fefed7f079c 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -6,7 +6,7 @@
 #
 # 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 in the directory of this software distribution.
+# EXCEPTIONS-CLIENT in the directory of this software distribution.
 # 
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 9e97e6b00eb..06d5c14f602 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -6,7 +6,7 @@
 #
 # 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 in the directory of this software distribution.
+# EXCEPTIONS-CLIENT in the directory of this software distribution.
 # 
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c
index 8c9b5ede7bd..e9084afae41 100644
--- a/libmysql/conf_to_src.c
+++ b/libmysql/conf_to_src.c
@@ -6,7 +6,7 @@
 
    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 in the directory of this software distribution.
+   EXCEPTIONS-CLIENT in the directory of this software distribution.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/dll.c b/libmysql/dll.c
index f983f4b4409..90731ee209e 100644
--- a/libmysql/dll.c
+++ b/libmysql/dll.c
@@ -6,7 +6,7 @@
 
    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 in the directory of this software distribution.
+   EXCEPTIONS-CLIENT in the directory of this software distribution.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index cb0e8e79cf8..e43864bfd33 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -6,7 +6,7 @@
 
    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 in the directory of this software distribution.
+   EXCEPTIONS-CLIENT in the directory of this software distribution.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/get_password.c b/libmysql/get_password.c
index 350207e0aee..e55e77320f0 100644
--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@@ -6,7 +6,7 @@
 
    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 in the directory of this software distribution.
+   EXCEPTIONS-CLIENT in the directory of this software distribution.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index cabdd5fca95..cbe6bb3959f 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -6,7 +6,7 @@
 
    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 in the directory of this software distribution.
+   EXCEPTIONS-CLIENT in the directory of this software distribution.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/manager.c b/libmysql/manager.c
index 46a56f155e9..8e0f56326ac 100644
--- a/libmysql/manager.c
+++ b/libmysql/manager.c
@@ -6,7 +6,7 @@
 
    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 in the directory of this software distribution.
+   EXCEPTIONS-CLIENT in the directory of this software distribution.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 55ae906ee96..8ed4a64d309 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -6,7 +6,7 @@
 #
 # 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 in the directory of this software distribution.
+# EXCEPTIONS-CLIENT in the directory of this software distribution.
 # 
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index d78a7ee28b9..8ea9a16f56b 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -86,7 +86,7 @@ do
 done
 
 for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \
-         EXCEPTIONS MySQLEULA.txt LICENSE.doc README.NW
+         EXCEPTIONS-CLIENT MySQLEULA.txt LICENSE.doc README.NW
 do
   if [ -f $i ]
   then
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 8837628a1a5..9aca62527e6 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -272,7 +272,7 @@ touch $BASE/innobase/ib_config.h
 #
 
 cd $SOURCE
-for i in COPYING ChangeLog README EXCEPTIONS\
+for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\
          INSTALL-SOURCE INSTALL-WIN \
          INSTALL-WIN-SOURCE \
          Docs/manual_toc.html  Docs/manual.html \
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 9670ccf569d..8a74543d053 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -446,7 +446,7 @@ fi
 %files server
 %defattr(-,root,root,0755)
 
-%doc COPYING EXCEPTIONS README 
+%doc COPYING EXCEPTIONS-CLIENT README 
 %doc Docs/manual.{html,ps,texi,txt}
 %doc Docs/manual_toc.html
 %doc support-files/my-*.cnf