Author: jstephens
Date: 2007-01-06 11:10:21 +0100 (Sat, 06 Jan 2007)
New Revision: 4387
Log:
Added warning about unlicenced InnoDB usage for Telco customers.
Modified:
branches/telcos/common/phrases.ent
branches/telcos/refman-5.1/introduction.xml
branches/telcos/refman-5.1/preface.xml
branches/telcos/refman-5.1/se-innodb.xml
branches/telcos/refman-5.1/storage-engines.xml
branches/telcos/refman-5.1/versions.ent
Modified: branches/telcos/common/phrases.ent
===================================================================
--- branches/telcos/common/phrases.ent 2007-01-05 16:53:55 UTC (rev 4386)
+++ branches/telcos/common/phrases.ent 2007-01-06 10:10:21 UTC (rev 4387)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 648 bytes
@@ -10,3 +10,5 @@
<!ENTITY falcon-warning '<para role="deprecated"><emphasis role="bold">Falcon support is not available in the standard MySQL 5.1 release. Falcon is available only in a specially forked release of MySQL 5.1. Information is provided here for evaluation purposes only.</emphasis></para>'>
<!ENTITY questions 'Questions'>
<!ENTITY questionsandanswers 'Questions and Answers'>
+
+
Modified: branches/telcos/refman-5.1/introduction.xml
===================================================================
--- branches/telcos/refman-5.1/introduction.xml 2007-01-05 16:53:55 UTC (rev 4386)
+++ branches/telcos/refman-5.1/introduction.xml 2007-01-06 10:10:21 UTC (rev 4387)
Changed blocks: 4, Lines Added: 46, Lines Deleted: 37; 5171 bytes
@@ -30,15 +30,6 @@
</para>
<para>
- The MySQL software is Dual Licensed. Users can choose to use the
- MySQL software as an Open Source product under the terms of the GNU
- General Public License (<ulink url="http://www.fsf.org/licenses/"/>)
- or can purchase a standard commercial license from MySQL AB. See
- <ulink url="http://www.mysql.com/company/legal/licensing/"/> for
- more information on our licensing policies.
- </para>
-
- <para>
The following list describes some sections of particular interest in
this manual:
</para>
@@ -134,21 +125,19 @@
</itemizedlist>
- <para>
- <emphasis role="bold">Important</emphasis>:
- </para>
+ <important>
+ <para>
+ To report errors (often called <quote>bugs</quote>), please use
+ the instructions at <xref linkend="bug-reports"/>.
+ </para>
- <para>
- To report errors (often called <quote>bugs</quote>), please use the
- instructions at <xref linkend="bug-reports"/>.
- </para>
+ <para>
+ If you have found a sensitive security bug in MySQL Server, please
+ let us know immediately by sending an email message to
+ <email>security@stripped</email>.
+ </para>
+ </important>
- <para>
- If you have found a sensitive security bug in MySQL Server, please
- let us know immediately by sending an email message to
- <email>security@stripped</email>.
- </para>
-
<indexterm>
<primary>errors</primary>
<secondary>reporting</secondary>
@@ -181,24 +170,38 @@
</remark>
<para>
- This is the Reference Manual for the MySQL Database System,
- version ¤t-series;, through release ¤t-version;. It is
- not intended for use with older versions of the MySQL software due
- to the many functional and other differences between MySQL
- ¤t-series; and previous versions. If you are using an
- earlier release of the MySQL software, please refer to the
- <ulink url="&base-url-refman;/&previous-series;/en/"><citetitle>&title-refman-previous;</citetitle></ulink>,
- which covers the &previous-series; series of MySQL software
- releases, or to
- <ulink url="&base-url-refman;/4.1/en/"><citetitle>MySQL 3.23, 4.0,
- 4.1 Reference Manual</citetitle></ulink>, which covers the 3.23,
- 4.0, and 4.1 series of MySQL software releases. Differences
- between minor versions of MySQL ¤t-series; are noted in the
- present text with reference to release numbers
- (¤t-series;.<replaceable>x</replaceable>).
+ This is the Reference Manual for the MySQL Database System
+ ¤t-series;, through release ¤t-version;. Although it
+ contains references to older releases, it is not intended for use
+ with any other version of the MySQL software due to functional and
+ other differences between MySQL ¤t-series; and those
+ versions. If you are not using MySQL ¤t-series;, please
+ refer to the version of the Manual appropriate to the version
+ which you are using, which can be found on the MySQL web site at
+ <ulink url="&base-url-refman;"/>. MySQL ¤t-series; branched
+ from the main MySQL development tree beginning with MySQL 5.1.14,
+ and are distinguished from the mainline versions by the addition
+ of
+ NDB-<replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable>
+ to the version string. The first release of MySQL ¤t-series;
+ was MySQL 5.1.14/NDB-6.1.0-beta. <emphasis>All</emphasis> minor
+ versions of MySQL ¤t-series; contain <quote>5.1.14</quote>
+ in the version string; the Telco Edition releases are identified
+ by this NDB release number
+ (NDB-<replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable>).
</para>
<para>
+ Note that information in this Manual relating to MySQL versions
+ 5.1.14. 5.1.13, and earlier in the MySQL 5.1 series also applies
+ to Telco Edition releases, as such information reflects features
+ already present and changes already in effect at the time that
+ MySQL ¤t-series; was branched from the main 5.1 tree.
+ </para>
+
+ &innodb-warning;
+
+ <para>
Because this manual serves as a reference, it does not provide
general instruction on SQL or relational database concepts. It
also does not teach you how to use your operating system or
@@ -242,6 +245,12 @@
</programlisting>
<para>
+ You can find the sources for this Telco Edition of the Manual in
+ the directory <filename>branches/telcos/refman-5.1</filename> of
+ the documentation repository.
+ </para>
+
+ <para>
If you have questions about using MySQL, you can ask them using
our mailing lists or forums. See <xref linkend="mailing-lists"/>,
and <xref linkend="forums"/>. If you have suggestions concerning
Modified: branches/telcos/refman-5.1/preface.xml
===================================================================
--- branches/telcos/refman-5.1/preface.xml 2007-01-05 16:53:55 UTC (rev 4386)
+++ branches/telcos/refman-5.1/preface.xml 2007-01-06 10:10:21 UTC (rev 4387)
Changed blocks: 1, Lines Added: 25, Lines Deleted: 19; 2942 bytes
@@ -14,26 +14,32 @@
<title>Preface</title>
<para>
- This is the Reference Manual for the MySQL Database System, version
- ¤t-series;, up to release ¤t-version;. It is not
- intended for use with older versions of the MySQL software due to
- the many functional and other differences between MySQL
- ¤t-series; and previous versions.
+ This is the Reference Manual for the MySQL Database System
+ ¤t-series;, through release ¤t-version;. Although it
+ contains references to older releases, it is not intended for use
+ with any other version of the MySQL software due to functional and
+ other differences between MySQL ¤t-series; and those versions.
+ If you are not using MySQL ¤t-series;, please refer to the
+ version of the Manual appropriate to the version which you are
+ using, which can be found on the MySQL web site at
+ <ulink url="&base-url-refman;"/>. MySQL ¤t-series; branched
+ from the main MySQL development tree beginning with MySQL 5.1.14,
+ and are distinguished from the mainline versions by the addition of
+ NDB-<replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable>
+ to the version string. The first release of MySQL ¤t-series;
+ was MySQL 5.1.14/NDB-6.1.0-beta. <emphasis>All</emphasis> minor
+ versions of MySQL ¤t-series; contain <quote>5.1.14</quote> in
+ the version string; the Telco Edition releases are identified by
+ this NDB release number
+ (NDB-<replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable>).
+ </para>
- <remark role="todo">
- Update next sentence with a link when it's been determined how
- this should be handled. Likely to be something like
- &base-url-docs;en/4-1/ ?
- </remark>
-
- If you are using an earlier release of the MySQL software, please
- refer to the <citetitle>&title-refman-previous;</citetitle>, which
- provides coverage of MySQL &previous-series;, or to the
- <citetitle>MySQL 3.23, 4.0, 4.1 Reference Manual</citetitle>, which
- covers MySQL 4.1 and all earlier versions of MySQL. Differences
- between minor versions of MySQL ¤t-series; are noted in the
- present text with reference to release numbers
- (¤t-series;.<replaceable>x</replaceable>).
+ <para>
+ Note that information in this Manual relating to MySQL versions
+ 5.1.14 and earlier also applies to Telco Editin releases, as such
+ information reflects features already present and changes already in
+ effect at the time that MySQL ¤t-series; was branched from the
+ main 5.1 tree.
</para>
<remark>
Modified: branches/telcos/refman-5.1/se-innodb.xml
===================================================================
--- branches/telcos/refman-5.1/se-innodb.xml 2007-01-05 16:53:55 UTC (rev 4386)
+++ branches/telcos/refman-5.1/se-innodb.xml 2007-01-06 10:10:21 UTC (rev 4387)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 464 bytes
@@ -48,6 +48,8 @@
<indexterm>
<primary>ACID</primary>
</indexterm>
+
+ &innodb-warning;
<para>
<literal>InnoDB</literal> provides MySQL with a transaction-safe
Modified: branches/telcos/refman-5.1/storage-engines.xml
===================================================================
--- branches/telcos/refman-5.1/storage-engines.xml 2007-01-05 16:53:55 UTC (rev 4386)
+++ branches/telcos/refman-5.1/storage-engines.xml 2007-01-06 10:10:21 UTC (rev 4387)
Changed blocks: 11, Lines Added: 22, Lines Deleted: 27; 5897 bytes
@@ -77,7 +77,7 @@
<indexterm>
<primary><literal>Falcon</literal> storage engine</primary>
</indexterm>
-
+
<para>
MySQL supports several storage engines that act as handlers for
different table types. MySQL storage engines include both those that
@@ -95,10 +95,10 @@
This chapter describes each of the MySQL storage engines except for
<literal>NDB Cluster</literal>, which is covered in
<xref linkend="mysql-cluster"/>. It also contains a description of
- the pluggable storage engine architecture (see
+ the pluggable storage engine architecture (see
<xref linkend="pluggable-storage-overview"/>).
</para>
-
+
<para>
For answers to some commonly asked questions about MySQL storage
engines, see <xref linkend="faqs-storage-engines"/>.
@@ -122,7 +122,8 @@
</para>
<para>
- The MySQL pluggable storage engine architecture in shown in <xref linkend="figure-storage-engine-architecture"/>.
+ The MySQL pluggable storage engine architecture in shown in
+ <xref linkend="figure-storage-engine-architecture"/>.
</para>
<figure id="figure-storage-engine-architecture">
@@ -397,8 +398,11 @@
source distributions, you can enable or disable either engine
by configuring MySQL as you like.
</para>
+
+ &innodb-warning;
+
</listitem>
-
+
<listitem>
<para>
<link linkend="memory-storage-engine"><literal>Memory</literal></link>
@@ -821,24 +825,19 @@
<para>
You can find more information on the list of third party storage
engines on the
- <ulink
- url="http://forge.mysql.com/projects/search.php?t=tag&k=storage%20engine">MySQL
+ <ulink url="http://forge.mysql.com/projects/search.php?t=tag&k=storage%20engine">MySQL
Forge Storage Engines</ulink> page.
</para>
- <formalpara>
-
- <title>Note</title>
-
+ <note>
<para>
Third party engines are not supported by MySQL. For further
information, documentation, installation guides, bug reporting
or for any any help or assistance with these engines, please
contact the developer of the engine directly.
</para>
+ </note>
- </formalpara>
-
<para>
Third party engines that are known to be available include the
following; please see the MySQL Forge links provided for more
@@ -849,8 +848,7 @@
<listitem>
<para>
- <emphasis role="bold"><ulink
- url="http://forge.mysql.com/projects/view.php?id=43">PrimeBase
+ <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/view.php?id=43">PrimeBase
XT (PBXT)</ulink></emphasis> — PBXT has been designed
for modern, web-based, high concurrency environments.
</para>
@@ -858,8 +856,7 @@
<listitem>
<para>
- <emphasis role="bold"><ulink
- url="http://forge.mysql.com/projects/view.php?id=82">RitmarkFS</ulink></emphasis>
+ <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/view.php?id=82">RitmarkFS</ulink></emphasis>
— RitmarkFS allows you to access and manipulate the
filesystem using SQL queries. RitmarkFS also supports
filesystem replication and directory change tracking.
@@ -878,18 +875,16 @@
<listitem>
<para>
- <emphasis role="bold"><ulink
- url="http://forge.mysql.com/projects/view.php?id=98">mdbtools</ulink></emphasis>
+ <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/view.php?id=98">mdbtools</ulink></emphasis>
— A pluggable storage engine that allows read-only
- access to MicroSoft Access <literal>.mdb</literal> database
- files.
+ access to Microsoft Access <filename>.mdb</filename>
+ database files.
</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold"><ulink
- url="http://forge.mysql.com/projects/view.php?id=139">solidDB
+ <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/view.php?id=139">solidDB
for MySQL</ulink></emphasis> — solidDB Storage Engine
for MySQL is an open source, transactional storage engine
for MySQL Server. It is designed for mission-critical
@@ -897,7 +892,7 @@
database. solidDB Storage Engine for MySQL is a
multi-threaded storage engine that supports full ACID
compliance with all expected transaction isolation levels,
- row-level locking, and Multi-Version Concurrency Control
+ row-level locking, and multi-version concurrency control
(MVCC) with non-blocking reads and writes.
</para>
</listitem>
@@ -907,8 +902,8 @@
<para>
For more information on developing a customer storage engine
that can be used with the Pluggable Storage Engine Architecture,
- see <xref
- linkend="custom-engine"/>, of the MySQL Internals manual.
+ see <xref linkend="custom-engine"/>, of the MySQL Internals
+ manual.
</para>
</section>
@@ -1018,7 +1013,7 @@
<xi:include href="se-myisam.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="se-innodb.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
+
<xi:include href="se-merge.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="se-memory.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: branches/telcos/refman-5.1/versions.ent
===================================================================
--- branches/telcos/refman-5.1/versions.ent 2007-01-05 16:53:55 UTC (rev 4386)
+++ branches/telcos/refman-5.1/versions.ent 2007-01-06 10:10:21 UTC (rev 4387)
Changed blocks: 1, Lines Added: 17, Lines Deleted: 1; 1734 bytes
@@ -4,8 +4,24 @@
version of the manual.
-->
<!ENTITY title-refman-previous "MySQL 5.0 Reference Manual"><!-- Title of Manual previous edition -->
-<!ENTITY current-series "5.1"><!-- Current MySQL release series -->
+<!ENTITY current-series "5.1 Telco Edition"><!-- Current MySQL release series -->
<!ENTITY previous-series "5.0"><!-- Previous MySQL release series -->
<!ENTITY next-series "5.2"><!-- Next MySQL release series -->
<!ENTITY current-version "5.1.14/NDB-6.1.0-beta"><!-- Current MySQL Version - update with new releases -->
<!ENTITY current-maturity "beta"><!-- Current maturity level: alpha, beta, release candidate, production -->
+
+
+<!ENTITY innodb-warning '
+ <warning><para>
+ The presence in this Manual of information relating to the
+ <literal>InnoDB</literal> storage engine does <emphasis>not</emphasis>
+ constitute a license to use <literal>InnoDB</literal> commercially. You
+ must not compile, deploy, or make use of MySQL ¤t-series;
+ employing the <literal>InnoDB</literal> storage engine without prior
+ written permission to do so from MySQL AB. If you wish to use
+ <literal>InnoDB</literal> technology in conjunction with your use of
+ MySQL ¤t-series; and do not already have authorization to do so as
+ part of your MySQL Server license, contact your MySQL AB salesperson for
+ assistance in upgrading your license.
+ </para>
+ </warning>'>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4387 - in branches/telcos: common refman-5.1 | jon | 6 Jan |
