1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.0-bugteam.

Browse Source
This commit is contained in:
Alexander Nozdrin 2010-11-24 13:07:37 +03:00
commit 1e43b94c70
13 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
README COPYING EXCEPTIONS-CLIENT CMakeLists.txt README COPYING CMakeLists.txt
SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@readline_topdir@ sql-common scripts \ @readline_topdir@ sql-common scripts \

3
libmysql/Makefile.am
View File

@ -5,8 +5,7 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
# There are special exceptions to the terms and conditions of the GPL as it # 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 # is applied to this software.
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql/Makefile.shared
View File

@ -5,8 +5,7 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
# There are special exceptions to the terms and conditions of the GPL as it # 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 # is applied to this software.
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql/conf_to_src.c
View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it 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 is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql/dll.c
View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it 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 is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql/errmsg.c
View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it 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 is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql/get_password.c
View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it 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 is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql/libmysql.c
View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it 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 is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql/manager.c
View File

@ -5,8 +5,7 @@
the Free Software Foundation. the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it 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 is applied to this software.
EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

3
libmysql_r/Makefile.am
View File

@ -5,8 +5,7 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
# There are special exceptions to the terms and conditions of the GPL as it # 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 # is applied to this software.
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of

6
scripts/make_binary_distribution.sh
View File

@ -302,8 +302,8 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
# Copy readme and license files # Copy readme and license files
cp README Docs/INSTALL-BINARY $DEST/ cp README Docs/INSTALL-BINARY $DEST/
if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then if [ -f COPYING ] ; then
cp COPYING EXCEPTIONS-CLIENT $DEST/ cp COPYING $DEST/
elif [ -f LICENSE.mysql ] ; then elif [ -f LICENSE.mysql ] ; then
cp LICENSE.mysql $DEST/ cp LICENSE.mysql $DEST/
else else
@ -381,7 +381,7 @@ copyfileto()
copyfileto $BASE/docs ChangeLog Docs/mysql.info copyfileto $BASE/docs ChangeLog Docs/mysql.info
copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \ copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \
EXCEPTIONS-CLIENT LICENSE.mysql LICENSE.mysql
# Non platform-specific bin dir files: # Non platform-specific bin dir files:
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \

4
scripts/make_win_bin_dist
View File

@ -187,8 +187,8 @@ cp ChangeLog $DESTDIR/Docs/ || /bin/true
cp support-files/my-*.ini $DESTDIR/ cp support-files/my-*.ini $DESTDIR/
if [ -f COPYING ] ; then if [ -f COPYING ] ; then
cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ cp COPYING $DESTDIR/
cp COPYING $DESTDIR/Docs/ cp COPYING $DESTDIR/Docs/
fi fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------

5
support-files/mysql.spec.sh
View File

@ -1063,7 +1063,6 @@ fi
%files devel %files devel
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc mysql-release-%{mysql_version}/EXCEPTIONS-CLIENT
%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
%attr(755, root, root) %{_bindir}/mysql_config %attr(755, root, root) %{_bindir}/mysql_config
%dir %attr(755, root, root) %{_includedir}/mysql %dir %attr(755, root, root) %{_includedir}/mysql
@ -1134,6 +1133,10 @@ fi
############################################################################## ##############################################################################
%changelog %changelog
* Wed Nov 24 2010 Alexander Nozdrin <alexander.nozdrin@oracle.com>
- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com> * Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Change the behaviour on upgrade: - Change the behaviour on upgrade: