Skip to content

M
mariadb
Commit 1e2eb3cd authored by Sergey Vojtovich's avatar Sergey Vojtovich
Browse files
Options

Merge mysql-5.1 to mysql-5.1-bugteam.

parents 2cc8c47b fc4d400a
Show whitespace changes
Inline Side-by-side
Showing with 288 additions and 294 deletions
COPYING
View file @ 1e2eb3cd
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc. Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
Preamble Preamble
========
The licenses for most software are designed to take away your freedom The licenses for most software are designed to take away your
to share and change it. By contrast, the GNU General Public License is freedom to share and change it. By contrast, the GNU General Public
intended to guarantee your freedom to share and change free License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to the GNU Lesser General Public License instead.) You can apply it to
your programs, too. your programs, too.
When we speak of free software, we are referring to freedom, not price. When we speak of free software, we are referring to freedom, not
Our General Public Licenses are designed to make sure that you have price. Our General Public Licenses are designed to make sure that you
the freedom to distribute copies of free software (and charge for this have the freedom to distribute copies of free software (and charge for
service if you wish), that you receive source code or can get it if you this service if you wish), that you receive source code or can get it
want it, that you can change the software or use pieces of it in new if you want it, that you can change the software or use pieces of it
free programs; and that you know you can do these things. in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid anyone To protect your rights, we need to make restrictions that forbid
to deny you these rights or to ask you to surrender the rights. These anyone to deny you these rights or to ask you to surrender the rights.
restrictions translate to certain responsibilities for you if you These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it. distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether gratis For example, if you distribute copies of such a program, whether
or for a fee, you must give the recipients all the rights that you gratis or for a fee, you must give the recipients all the rights that
have. You must make sure that they, too, receive or can get the source you have. You must make sure that they, too, receive or can get the
code. And you must show them these terms so they know their rights. source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy, (2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software. distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original that any problems introduced by others will not reflect on the original
authors' reputations. authors' reputations.
Finally, any free program is threatened constantly by software patents. Finally, any free program is threatened constantly by software
We wish to avoid the danger that redistributors of a free program will patents. We wish to avoid the danger that redistributors of a free
individually obtain patent licenses, in effect making the program program will individually obtain patent licenses, in effect making the
proprietary. To prevent this, we have made it clear that any patent program proprietary. To prevent this, we have made it clear that any
must be licensed for everyone's free use or not licensed at all. patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and The precise terms and conditions for copying, distribution and
modification follow. modification follow.
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains a
notice placed by the copyright holder saying it may be distributed 0. This License applies to any program or other work which contains
under the terms of this General Public License. The "Program", a notice placed by the copyright holder saying it may be distributed
below, refers to any such program or work, and a "work based on under the terms of this General Public License. The "Program", below,
the Program" means either the Program or any derivative work under refers to any such program or work, and a "work based on the Program"
copyright law: that is to say, a work containing the Program or a means either the Program or any derivative work under copyright law:
portion of it, either verbatim or with modifications and/or that is to say, a work containing the Program or a portion of it,
translated into another language. (Hereinafter, translation is either verbatim or with modifications and/or translated into another
included without limitation in the term "modification".) Each language. (Hereinafter, translation is included without limitation in
licensee is addressed as "you". the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are Activities other than copying, distribution and modification are not
not covered by this License; they are outside its scope. The act covered by this License; they are outside its scope. The act of
of running the Program is not restricted, and the output from the running the Program is not restricted, and the output from the Program
Program is covered only if its contents constitute a work based on is covered only if its contents constitute a work based on the
the Program (independent of having been made by running the Program (independent of having been made by running the Program).
Program). Whether that is true depends on what the Program does. Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's 1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any notices that refer to this License and to the absence of any warranty;
warranty; and give any other recipients of the Program a copy of and give any other recipients of the Program a copy of this License
this License along with the Program. along with the Program.
You may charge a fee for the physical act of transferring a copy, You may charge a fee for the physical act of transferring a copy, and
and you may at your option offer warranty protection in exchange you may at your option offer warranty protection in exchange for a fee.
for a fee.
2. You may modify your copy or copies of the Program or any portion 2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1 distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions: above, provided that you also meet all of these conditions:
a. You must cause the modified files to carry prominent notices a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change. stating that you changed the files and the date of any change.
b. You must cause any work that you distribute or publish, that b) You must cause any work that you distribute or publish, that in
in whole or in part contains or is derived from the Program whole or in part contains or is derived from the Program or any
or any part thereof, to be licensed as a whole at no charge part thereof, to be licensed as a whole at no charge to all third
to all third parties under the terms of this License. parties under the terms of this License.
c. If the modified program normally reads commands interactively c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display interactive use in the most ordinary way, to print or display an
an announcement including an appropriate copyright notice and announcement including an appropriate copyright notice and a
a notice that there is no warranty (or else, saying that you notice that there is no warranty (or else, saying that you provide
provide a warranty) and that users may redistribute the a warranty) and that users may redistribute the program under
program under these conditions, and telling the user how to these conditions, and telling the user how to view a copy of this
view a copy of this License. (Exception: if the Program License. (Exception: if the Program itself is interactive but
itself is interactive but does not normally print such an does not normally print such an announcement, your work based on
announcement, your work based on the Program is not required the Program is not required to print an announcement.)
to print an announcement.)
These requirements apply to the modified work as a whole. If
These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program,
identifiable sections of that work are not derived from the and can be reasonably considered independent and separate works in
Program, and can be reasonably considered independent and separate themselves, then this License, and its terms, do not apply to those
works in themselves, then this License, and its terms, do not sections when you distribute them as separate works. But when you
apply to those sections when you distribute them as separate distribute the same sections as part of a whole which is a work based
works. But when you distribute the same sections as part of a on the Program, the distribution of the whole must be on the terms of
whole which is a work based on the Program, the distribution of this License, whose permissions for other licensees extend to the
the whole must be on the terms of this License, whose permissions entire whole, and thus to each and every part regardless of who wrote it.
for other licensees extend to the entire whole, and thus to each
and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
Thus, it is not the intent of this section to claim rights or exercise the right to control the distribution of derivative or
contest your rights to work written entirely by you; rather, the collective works based on the Program.
intent is to exercise the right to control the distribution of
derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
In addition, mere aggregation of another work not based on the a storage or distribution medium does not bring the other work under
Program with the Program (or with a work based on the Program) on the scope of this License.
a volume of a storage or distribution medium does not bring the
other work under the scope of this License.
3. You may copy and distribute the Program (or a work based on it, 3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms under Section 2) in object code or executable form under the terms of
of Sections 1 and 2 above provided that you also do one of the Sections 1 and 2 above provided that you also do one of the following:
following:
a. Accompany it with the complete corresponding machine-readable a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of source code, which must be distributed under the terms of Sections
Sections 1 and 2 above on a medium customarily used for 1 and 2 above on a medium customarily used for software interchange; or,
software interchange; or,
b. Accompany it with a written offer, valid for at least three b) Accompany it with a written offer, valid for at least three
years, to give any third-party, for a charge no more than your years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a distributed under the terms of Sections 1 and 2 above on a medium
medium customarily used for software interchange; or, customarily used for software interchange; or,
c. Accompany it with the information you received as to the offer c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you allowed only for noncommercial distribution and only if you
received the program in object code or executable form with received the program in object code or executable form with such
such an offer, in accord with Subsection b above.) an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete making modifications to it. For an executable work, complete source
source code means all the source code for all modules it contains, code means all the source code for all modules it contains, plus any
plus any associated interface definition files, plus the scripts associated interface definition files, plus the scripts used to
used to control compilation and installation of the executable. control compilation and installation of the executable. However, as a
However, as a special exception, the source code distributed need special exception, the source code distributed need not include
not include anything that is normally distributed (in either anything that is normally distributed (in either source or binary
source or binary form) with the major components (compiler, form) with the major components (compiler, kernel, and so on) of the
kernel, and so on) of the operating system on which the executable operating system on which the executable runs, unless that component
runs, unless that component itself accompanies the executable. itself accompanies the executable.
If distribution of executable or object code is made by offering If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not distribution of the source code, even though third parties are not
compelled to copy the source along with the object code. compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program 4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this void, and will automatically terminate your rights under this License.
License. However, parties who have received copies, or rights, However, parties who have received copies, or rights, from you under
from you under this License will not have their licenses this License will not have their licenses terminated so long as such
terminated so long as such parties remain in full compliance. parties remain in full compliance.
5. You are not required to accept this License, since you have not 5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify signed it. However, nothing else grants you permission to modify or
or distribute the Program or its derivative works. These actions distribute the Program or its derivative works. These actions are
are prohibited by law if you do not accept this License. prohibited by law if you do not accept this License. Therefore, by
Therefore, by modifying or distributing the Program (or any work modifying or distributing the Program (or any work based on the
based on the Program), you indicate your acceptance of this Program), you indicate your acceptance of this License to do so, and
License to do so, and all its terms and conditions for copying, all its terms and conditions for copying, distributing or modifying
distributing or modifying the Program or works based on it. the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the 6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program original licensor to copy, distribute or modify the Program subject to
subject to these terms and conditions. You may not impose any these terms and conditions. You may not impose any further
further restrictions on the recipients' exercise of the rights restrictions on the recipients' exercise of the rights granted herein.
granted herein. You are not responsible for enforcing compliance You are not responsible for enforcing compliance by third parties to
by third parties to this License. this License.
7. If, as a consequence of a court judgment or allegation of patent 7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent infringement or for any other reason (not limited to patent issues),
issues), conditions are imposed on you (whether by court order, conditions are imposed on you (whether by court order, agreement or
agreement or otherwise) that contradict the conditions of this otherwise) that contradict the conditions of this License, they do not
License, they do not excuse you from the conditions of this excuse you from the conditions of this License. If you cannot
License. If you cannot distribute so as to satisfy simultaneously distribute so as to satisfy simultaneously your obligations under this
your obligations under this License and any other pertinent License and any other pertinent obligations, then as a consequence you
obligations, then as a consequence you may not distribute the may not distribute the Program at all. For example, if a patent
Program at all. For example, if a patent license would not permit license would not permit royalty-free redistribution of the Program by
royalty-free redistribution of the Program by all those who all those who receive copies directly or indirectly through you, then
receive copies directly or indirectly through you, then the only the only way you could satisfy both it and this License would be to
way you could satisfy both it and this License would be to refrain refrain entirely from distribution of the Program.
entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
If any portion of this section is held invalid or unenforceable any particular circumstance, the balance of the section is intended to
under any particular circumstance, the balance of the section is apply and the section as a whole is intended to apply in other
intended to apply and the section as a whole is intended to apply circumstances.
in other circumstances.
It is not the purpose of this section to induce you to infringe any
It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any
patents or other property right claims or to contest validity of such claims; this section has the sole purpose of protecting the
any such claims; this section has the sole purpose of protecting integrity of the free software distribution system, which is
the integrity of the free software distribution system, which is implemented by public license practices. Many people have made
implemented by public license practices. Many people have made generous contributions to the wide range of software distributed
generous contributions to the wide range of software distributed through that system in reliance on consistent application of that
through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing
system; it is up to the author/donor to decide if he or she is to distribute software through any other system and a licensee cannot
willing to distribute software through any other system and a impose that choice.
licensee cannot impose that choice.
This section is intended to make thoroughly clear what is believed to
This section is intended to make thoroughly clear what is believed be a consequence of the rest of this License.
to be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in 8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, certain countries either by patents or by copyrighted interfaces, the
the original copyright holder who places the Program under this original copyright holder who places the Program under this License
License may add an explicit geographical distribution limitation may add an explicit geographical distribution limitation excluding
excluding those countries, so that distribution is permitted only those countries, so that distribution is permitted only in or among
in or among countries not thus excluded. In such case, this countries not thus excluded. In such case, this License incorporates
License incorporates the limitation as if written in the body of the limitation as if written in the body of this License.
this License.
9. The Free Software Foundation may publish revised and/or new versions
9. The Free Software Foundation may publish revised and/or new of the General Public License from time to time. Such new versions will
versions of the General Public License from time to time. Such be similar in spirit to the present version, but may differ in detail to
new versions will be similar in spirit to the present version, but address new problems or concerns.
may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Program
Each version is given a distinguishing version number. If the specifies a version number of this License which applies to it and "any
Program specifies a version number of this License which applies later version", you have the option of following the terms and conditions
to it and "any later version", you have the option of following either of that version or of any later version published by the Free
the terms and conditions either of that version or of any later Software Foundation. If the Program does not specify a version number of
version published by the Free Software Foundation. If the Program this License, you may choose any version ever published by the Free Software
does not specify a version number of this License, you may choose Foundation.
any version ever published by the Free Software Foundation.
10. If you wish to incorporate parts of the Program into other free 10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the programs whose distribution conditions are different, write to the author
author to ask for permission. For software which is copyrighted to ask for permission. For software which is copyrighted by the Free
by the Free Software Foundation, write to the Free Software Software Foundation, write to the Free Software Foundation; we sometimes
Foundation; we sometimes make exceptions for this. Our decision make exceptions for this. Our decision will be guided by the two goals
will be guided by the two goals of preserving the free status of of preserving the free status of all derivatives of our free software and
all derivatives of our free software and of promoting the sharing of promoting the sharing and reuse of software generally.
and reuse of software generally.
NO WARRANTY NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
SERVICING, REPAIR OR CORRECTION. REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN POSSIBILITY OF SUCH DAMAGES.
ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
=============================================
If you develop a new program, and you want it to be of the greatest How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these free software which everyone can redistribute and change under these terms.
terms.
To do so, attach the following notices to the program. It is safest to To do so, attach the following notices to the program. It is safest
attach them to the start of each source file to most effectively convey to attach them to the start of each source file to most effectively
the exclusion of warranty; and each file should have at least the convey the exclusion of warranty; and each file should have at least
"copyright" line and a pointer to where the full notice is found. the "copyright" line and a pointer to where the full notice is found.
ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES. <one line to give the program's name and a brief idea of what it does.>
Copyright (C) YYYY NAME OF AUTHOR Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -314,25 +303,24 @@ the exclusion of warranty; and each file should have at least the ...@@ -314,25 +303,24 @@ the exclusion of warranty; and each file should have at least the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License along
along with this program; if not, write to the Free Software with this program; if not, write to the Free Software Foundation, Inc.,
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this If the program is interactive, make it output a short notice like this
when it starts in an interactive mode: when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19YY NAME OF AUTHOR Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the The hypothetical commands `show w' and `show c' should show the appropriate
appropriate parts of the General Public License. Of course, the parts of the General Public License. Of course, the commands you use may
commands you use may be called something other than `show w' and `show be called something other than `show w' and `show c'; they could even be
c'; they could even be mouse-clicks or menu items--whatever suits your mouse-clicks or menu items--whatever suits your program.
program.
You should also get your employer (if you work as a programmer) or your You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if school, if any, to sign a "copyright disclaimer" for the program, if
...@@ -341,12 +329,11 @@ necessary. Here is a sample; alter the names: ...@@ -341,12 +329,11 @@ necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker. `Gnomovision' (which makes passes at compilers) written by James Hacker.
SIGNATURE OF TY COON, 1 April 1989 <signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice Ty Coon, President of Vice
This General Public License does not permit incorporating your program This General Public License does not permit incorporating your program into
into proprietary programs. If your program is a subroutine library, proprietary programs. If your program is a subroutine library, you may
you may consider it more useful to permit linking proprietary consider it more useful to permit linking proprietary applications with the
applications with the library. If this is what you want to do, use the library. If this is what you want to do, use the GNU Lesser General
GNU Library General Public License instead of this License. Public License instead of this License.
configure.in
View file @ 1e2eb3cd
...@@ -12,7 +12,7 @@ dnl ...@@ -12,7 +12,7 @@ dnl
dnl When changing the major version number please also check the switch dnl When changing the major version number please also check the switch
dnl statement in mysqlbinlog::check_master_version(). You may also need dnl statement in mysqlbinlog::check_master_version(). You may also need
dnl to update version.c in ndb. dnl to update version.c in ndb.
AC_INIT([MySQL Server], [5.1.45], [], [mysql]) AC_INIT([MySQL Server], [5.1.46], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
......
support-files/mysql.spec.sh
View file @ 1e2eb3cd
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
# NOTE: "vendor" is used in upgrade/downgrade check, so you can't # NOTE: "vendor" is used in upgrade/downgrade check, so you can't
# change these, has to be exactly as is. # change these, has to be exactly as is.
%define mysql_old_vendor MySQL AB %define mysql_old_vendor MySQL AB
%define mysql_vendor Sun Microsystems, Inc. %define mysql_vendor_2 Sun Microsystems, Inc.
%define mysql_vendor Oracle and/or its affiliates
%define mysql_version @VERSION@ %define mysql_version @VERSION@
...@@ -617,6 +618,7 @@ if [ $? -eq 0 -a -n "$installed" ]; then ...@@ -617,6 +618,7 @@ if [ $? -eq 0 -a -n "$installed" ]; then
vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1` vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
myoldvendor='%{mysql_old_vendor}' myoldvendor='%{mysql_old_vendor}'
myvendor_2='%{mysql_vendor_2}'
myvendor='%{mysql_vendor}' myvendor='%{mysql_vendor}'
myversion='%{mysql_version}' myversion='%{mysql_version}'
...@@ -628,10 +630,10 @@ if [ $? -eq 0 -a -n "$installed" ]; then ...@@ -628,10 +630,10 @@ if [ $? -eq 0 -a -n "$installed" ]; then
[ -z "$new_family" ] && new_family="<bad package specification: version $myversion>" [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
error_text= error_text=
if [ "$vendor" != "$myoldvendor" -a "$vendor" != "$myvendor" ]; then if [ "$vendor" != "$myoldvendor" -a "$vendor" != "$myvendor_2" -a "$vendor" != "$myvendor" ]; then
error_text="$error_text error_text="$error_text
The current MySQL server package is provided by a different The current MySQL server package is provided by a different
vendor ($vendor) than $myoldvendor or $myvendor. vendor ($vendor) than $myoldvendor, $myvendor_2, or $myvendor.
Some files may be installed to different locations, including log Some files may be installed to different locations, including log
files and the service startup script in %{_sysconfdir}/init.d/. files and the service startup script in %{_sysconfdir}/init.d/.
" "
...@@ -1036,6 +1038,11 @@ fi ...@@ -1036,6 +1038,11 @@ fi
# merging BK trees) # merging BK trees)
############################################################################## ##############################################################################
%changelog %changelog
* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
accept upgrading from packages showing MySQL or Sun as vendor.
* Fri Feb 05 2010 Joerg Bruehe <joerg.bruehe@sun.com> * Fri Feb 05 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Formatting changes: - Formatting changes:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7