3595 Jonathan Perkin 2011-02-16 [merge]
Merge to mysql-5.1
3594 Bjorn Munch 2011-02-16
Simple fix of suppress pattern in test insert_select
=== modified file 'README'
--- a/README 2011-01-25 14:42:40 +0000
+++ b/README 2011-02-16 22:43:56 +0000
@@ -3,18 +3,29 @@ MySQL Server
This is a release of MySQL, a dual-license SQL database server.
For the avoidance of doubt, this particular copy of the software
is released under the version 2 of the GNU General Public License.
-MySQL is brought to you by the MySQL team at Oracle.
+MySQL is brought to you by Oracle.
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
License information can be found in the COPYING file.
+MySQL FOSS License Exception
+We want free and open source software applications under certain
+licenses to be able to use specified GPL-licensed MySQL client
+libraries despite the fact that not all such FOSS licenses are
+compatible with version 2 of the GNU General Public License.
+Therefore there are special exceptions to the terms and conditions
+of the GPLv2 as applied to these client libraries, which are
+identified and described in more detail in the FOSS License
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
+this distribution (see the "Licenses for Third-Party Components"
+appendix) or view the online documentation at
For the avoidance of doubt, except that if any license choice
@@ -38,8 +49,6 @@ Some Reference Manual sections of specia
- For the new features/bugfix history, see the MySQL Change History
-- For currently known bugs, see the Errors and Common Problems
You can browse the MySQL Reference Manual online or download it
in any of several formats at the URL given earlier in this file.
Attachment: [text/bzr-bundle] email@example.com
|• bzr push into mysql-5.1 branch (jonathan.perkin:3594 to 3595) ||Jonathan Perkin||16 Feb|