mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from mysql-5.1-bugteam.

Browse source
This commit is contained in:
Alexander Nozdrin 2010-11-22 18:48:25 +03:00
commit d1f6adcfc4
2 changed files with 2302 additions and 2329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
EXCEPTIONS-CLIENT
View file

@ -1,119 +0,0 @@
MySQL FLOSS License Exception
The MySQL AB Exception for Free/Libre and Open Source
Software-only Applications Using MySQL Client Libraries (the
"FLOSS Exception").
Version 0.6, 7 March 2007
Exception Intent
We want specified Free/Libre and Open Source Software (``FLOSS'')
applications to be able to use specified GPL-licensed MySQL client
libraries (the ``Program'') despite the fact that not all FLOSS
licenses are compatible with version 2 of the GNU General Public
License (the ``GPL'').
Legal Terms and Conditions
As a special exception to the terms and conditions of version 2.0
of the GPL:
1. You are free to distribute a Derivative Work that is formed
entirely from the Program and one or more works (each, a
"FLOSS Work") licensed under one or more of the licenses
listed below in section 1, as long as:
a. You obey the GPL in all respects for the Program and the
Derivative Work, except for identifiable sections of the
Derivative Work which are not derived from the Program,
and which can reasonably be considered independent and
separate works in themselves,
b. all identifiable sections of the Derivative Work which
are not derived from the Program, and which can
reasonably be considered independent and separate works
in themselves,
i. are distributed subject to one of the FLOSS licenses
listed below, and
ii. the object code or executable form of those sections
are accompanied by the complete corresponding
machine-readable source code for those sections on
the same medium and under the same FLOSS license as
the corresponding object code or executable forms of
those sections, and
c. any works which are aggregated with the Program or with a
Derivative Work on a volume of a storage or distribution
medium in accordance with the GPL, can reasonably be
considered independent and separate works in themselves
which are not derivatives of either the Program, a
Derivative Work or a FLOSS Work.
If the above conditions are not met, then the Program may only
be copied, modified, distributed or used under the terms and
conditions of the GPL or another valid licensing option from
MySQL AB.
2. FLOSS License List
License name Version(s)/Copyright Date
Academic Free License 2.0
Apache Software License 1.0/1.1/2.0
Apple Public Source License 2.0
Artistic license From Perl 5.8.0
BSD license "July 22 1999"
Common Development and Distribution License (CDDL) 1.0
Common Public License 1.0
Eclipse Public License 1.0
GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
Jabber Open Source License 1.0
MIT license (As listed in file MIT-License.txt) ---
Mozilla Public License (MPL) 1.0/1.1
Open Software License 2.0
OpenSSL license (with original SSLeay license) "2003" ("1998")
PHP License 3.0
Python license (CNRI Python License) ---
Python Software Foundation License 2.1.1
Sleepycat License "1999"
University of Illinois/NCSA Open Source License ---
W3C License "2001"
X11 License "2001"
Zlib/libpng License ---
Zope Public License 2.0
Due to the many variants of some of the above licenses, we
require that any version follow the 2003 version of the Free
Software Foundation's Free Software Definition
(http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of
the Open Source Definition by the Open Source Initiative
(http://www.opensource.org/docs/definition.php).
3. Definitions
a. Terms used, but not defined, herein shall have the
meaning provided in the GPL.
b. Derivative Work means a derivative work under copyright
law.
4. Applicability: This FLOSS Exception applies to all Programs
that contain a notice placed by MySQL AB saying that the
Program may be distributed under the terms of this FLOSS
Exception. If you create or distribute a work which is a
Derivative Work of both the Program and any other work
licensed under the GPL, then this FLOSS Exception is not
available for that work; thus, you must remove the FLOSS
Exception notice from that work and comply with the GPL in all
respects, including by retaining all GPL notices. You may
choose to redistribute a copy of the Program exclusively under
the terms of the GPL by removing the FLOSS Exception notice
from that copy of the Program, provided that the copy has
never been modified by you or any third party.
Appendix A. Qualified Libraries and Packages
The following is a non-exhaustive list of libraries and packages
which are covered by the FLOSS License Exception. Please note that
this appendix is provided merely as an additional service to
specific FLOSS projects wishing to simplify licensing information
for their users. Compliance with one of the licenses noted under
the "FLOSS license list" section remains a prerequisite.
Package Name Qualifying License and Version
Apache Portable Runtime (APR) Apache Software License 2.0

178
README
View file

@ -1,58 +1,56 @@
This is a release of MySQL, a dual-license SQL DBMS. MySQL Server
MySQL is brought to you by the MySQL team at Oracle Corporation.
************************************************************ This is a release of MySQL, a dual-license SQL database server.
LICENSE For the avoidance of doubt, this particular copy of the software
************************************************************ is released under the version 2 of the GNU General Public License.
License information and use restrictions of this software can MySQL is brought to you by the MySQL team at Oracle.
be found in these files:
- For GPL (free) distributions, see the COPYING file and Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
the EXCEPTIONS-CLIENT file.
- For commercial distributions, see the LICENSE.mysql file. License information can be found in the COPYING file.
This distribution may include materials developed by third
parties. For license and attribution notices for these
materials, please refer to the documentation that accompanies
this distribution (see the Licenses for Third-Party Components
appendix). A copy of the license/notices is also reproduced
below.
GPLv2 Disclaimer GPLv2 Disclaimer
For the avoidance of doubt, except that if any license choice For the avoidance of doubt, except that if any license choice
other than GPL or LGPL is available it will apply instead, Oracle other than GPL or LGPL is available it will apply instead,
elects to use only the General Public License version 2 (GPLv2) Oracle elects to use only the General Public License version 2
at this time for any software where a choice of GPL license versions (GPLv2) at this time for any software where a choice of GPL
is made available with the language indicating that GPLv2 or any license versions is made available with the language indicating
later version may be used, or where a choice of which version of that GPLv2 or any later version may be used, or where a choice
the GPL is applied is otherwise unspecified. of which version of the GPL is applied is otherwise unspecified.
************************************************************ For further information about MySQL or additional documentation,
FURTHER INFORMATION see:
************************************************************ - The latest information about MySQL: http://www.mysql.com
For further information about MySQL or additional documentation, see: - The current MySQL documentation: http://dev.mysql.com/doc
- The latest information about MySQL: http://dev.mysql.com/
- The current MySQL documentation: http://dev.mysql.com/doc/
Some manual sections of special interest: Some Reference Manual sections of special interest:
- If you are migrating from an older version of MySQL, please read - If you are migrating from an older version of MySQL, please
the "Upgrading from..." section first! read the "Upgrading from..." section.
- To see what MySQL can do, take a look at the features section. - To see what MySQL can do, take a look at the features section.
- For installation instructions, see the Installing and Upgrading - For installation instructions, see the Installing and Upgrading
chapter. chapter.
- For the new features/bugfix history, see the Change History appendix. - For the new features/bugfix history, see the MySQL Change History
- For the currently known bugs/misfeatures (known errors) see the appendix.
Problems and Common Errors appendix. - For currently known bugs, see the Errors and Common Problems
- For a list of developers and other contributors, see the Credits appendix.
appendix.
A local copy of the MySQL Reference Manual can be found in the Docs You can browse the MySQL Reference Manual online or download it
directory in GNU Info format. You can also browse the manual online or in any of several formats at the URL given earlier in this file.
download it in any of several formats at the URL given earlier in this Source distributions include a local copy of the manual in the
file. Docs directory.
************************************************************ ********************************************************************
IMPORTANT:
Bug or error reports should be sent to http://bugs.mysql.com. Third-Party Component Notices
************************************************************
*********************************************************************
************************************************************
THIRD-PARTY SOFTWARE
************************************************************
%%The following software may be included in this product: %%The following software may be included in this product:
FindGTest.cmake (part of CMake 2.8.0) FindGTest.cmake (part of CMake 2.8.0)
@ -2208,3 +2206,97 @@ library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. Public License instead of this License.
*************************************************************************** ***************************************************************************
%%The following software may be included in this product:
pstack (part of GNU Binutils)
Use of any of this software is governed by the terms of the license below:
pstack is comprised of various .c and .h files; all begin like this:
/* bucomm.h -- binutils common include file.
Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
This file is part of GNU Binutils.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
***************************************************************************
%%The following software may be included in this product:
libiberty.h (part of pstack GNU Binutils)
Use of any of this software is governed by the terms of the license below:
See
http://www.koders.com/c/fid99F596804BBE22C076522B848D5575F142079064.aspx
/* Function declarations for libiberty.
Written by Cygnus Support, 1994.
The libiberty library provides a number of functions which are
missing on some operating systems. We do not declare those here,
to avoid conflicts with the system header files on operating
systems that do support those functions. In this file we only
declare those functions which are specific to libiberty. */
***************************************************************************
%%The following software may be included in this product:
ieee.h (part of pstack GNU Binutils)
Use of any of this software is governed by the terms of the license below:
See
http://src.opensolaris.org/source/xref//sfw/usr/src/cmd/gdb/gdb-6.3/include/ieee.h
/* IEEE Standard 695-1980 "Universal Format for Object Modules"
header file
Contributed by Cygnus Support. */
***************************************************************************
%%The following software may be included in this product:
pstack.c (part of pstack GNU Binutils)
Use of any of this software is governed by the terms of the license below:
/*
pstack.c -- asynchronous stack trace of a running process
Copyright (c) 1999 Ross Thompson
Author: Ross Thompson
Critical bug fix: Tim Waugh
*/
/*
This file is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
**********************************************************************