#At file:///home/cpowers/work/dev/mysql-5.0-bugteam/ based on revid:chris.powers@stripped
2891 Christopher Powers 2010-11-29 [merge]
merge
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
mysql-test/collections/default.push
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 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push 2009-02-24 10:42:11 +0000
+++ b/mysql-test/collections/default.push 2010-11-29 15:33:24 +0000
@@ -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
=== 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 <alexander.nozdrin@stripped>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
+
* Mon Feb 01 2010 Joerg Bruehe <joerg.bruehe@stripped>
- Formatting changes:
Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20101130031005-rqwbg5blzr7fo6xf.bundle
| Thread |
|---|
| • bzr commit into mysql-5.0-bugteam branch (chris.powers:2891) | Christopher Powers | 30 Nov |
