From 85f855e0ed38b73839943a83b2cccb1c46ba6fd9 Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Wed, 24 Nov 2010 12:53:39 +0300 Subject: A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all EXCEPTIONS-CLIENT from all the places. --- Makefile.am | 2 +- libmysql/Makefile.am | 3 +-- libmysql/Makefile.shared | 3 +-- libmysql/conf_to_src.c | 3 +-- libmysql/dll.c | 3 +-- libmysql/errmsg.c | 3 +-- libmysql/get_password.c | 3 +-- libmysql/libmysql.c | 3 +-- libmysql/manager.c | 3 +-- libmysql_r/Makefile.am | 3 +-- scripts/make_binary_distribution.sh | 2 +- scripts/make_win_bin_dist | 4 ++-- scripts/make_win_src_distribution_old.sh | 4 ++-- support-files/mysql.spec.sh | 5 ++++- 14 files changed, 19 insertions(+), 25 deletions(-) diff --git a/Makefile.am b/Makefile.am index 671bb3b9871..1f171bc9c7c 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 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 \ diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 13497331683..bab3368fbbf 100644 --- 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 diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index b7942d20cea..83ae79ebee2 100644 --- 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 diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c index 785e3cad4c1..f39a2e1856f 100644 --- 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 diff --git a/libmysql/dll.c b/libmysql/dll.c index 7bea5f880c5..a6a6a155dd3 100644 --- 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 diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 59089d5ec18..b509c53bc1b 100644 --- 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 diff --git a/libmysql/get_password.c b/libmysql/get_password.c index e55e77320f0..80b3c23c2f8 100644 --- 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 diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 62feae1b56e..7999041378a 100644 --- 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 diff --git a/libmysql/manager.c b/libmysql/manager.c index 3260ddcd685..f7ea7bb275b 100644 --- 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 diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index a8014b37bed..1fd0eff248a 100644 --- 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 diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index a089e8ef55d..93a78037843 100644 --- 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 \ diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 9e3fc010885..34134ccd977 100755 --- 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 # ---------------------------------------------------------------------- diff --git a/scripts/make_win_src_distribution_old.sh b/scripts/make_win_src_distribution_old.sh index dfb43585a21..f319bad6d55 100644 --- 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 \ diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 6baa19dc934..6bf5fca60ab 100644 --- 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 + +- EXCEPTIONS-CLIENT has been deleted, remove it from here too. + * Mon Feb 01 2010 Joerg Bruehe - Formatting changes: -- cgit v1.2.1 From 6bef32a76866d7bfae527eec032b5d6fb41bd2f4 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Mon, 29 Nov 2010 17:30:07 +0200 Subject: Fixed a pb2 issue with not finding the test dirs. --- mysql-test/collections/default.push | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/collections/default.push b/mysql-test/collections/default.push index 0f4115c8565..ce7b491efe7 100644 --- 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=n_stm --comment=n_stm +perl mysql-test-run.pl --timer --force --vardir=ps_stm --comment=ps_stm --ps-protocol -- cgit v1.2.1 From 2551fff8b2d50ecfd34a8100d95b2c8834f0fdb2 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Mon, 29 Nov 2010 17:33:24 +0200 Subject: Fixed bteam issue #37235: 5.0 trees now will work correctly in pb2 and will not display "indicated result file not found" due to wrongly named var directory. --- mysql-test/collections/default.push | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/collections/default.push b/mysql-test/collections/default.push index ce7b491efe7..638918d1026 100644 --- a/mysql-test/collections/default.push +++ b/mysql-test/collections/default.push @@ -1,2 +1,2 @@ -perl mysql-test-run.pl --timer --force --vardir=n_stm --comment=n_stm -perl mysql-test-run.pl --timer --force --vardir=ps_stm --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 -- cgit v1.2.1