From: jon Date: January 6 2007 10:10am Subject: svn commit - mysqldoc@docsrva: r4387 - in branches/telcos: common refman-5.1 List-Archive: http://lists.mysql.com/commits/17694 Message-Id: <200701061010.l06AANOj025200@docsrva.mysql.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @@ 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.'> + + 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 @@ - 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 () - or can purchase a standard commercial license from MySQL AB. See - for - more information on our licensing policies. - - - The following list describes some sections of particular interest in this manual: @@ -134,21 +125,19 @@ - - Important: - + + + To report errors (often called bugs), please use + the instructions at . + - - To report errors (often called bugs), please use the - instructions at . - + + If you have found a sensitive security bug in MySQL Server, please + let us know immediately by sending an email message to + security@stripped. + + - - If you have found a sensitive security bug in MySQL Server, please - let us know immediately by sending an email message to - security@stripped. - - errors reporting @@ -181,24 +170,38 @@ - 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 - &title-refman-previous;, - which covers the &previous-series; series of MySQL software - releases, or to - MySQL 3.23, 4.0, - 4.1 Reference Manual, 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;.x). + 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 + . 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-x.y.z + to the version string. The first release of MySQL ¤t-series; + was MySQL 5.1.14/NDB-6.1.0-beta. All minor + versions of MySQL ¤t-series; contain 5.1.14 + in the version string; the Telco Edition releases are identified + by this NDB release number + (NDB-x.y.z). + 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. + + + &innodb-warning; + + 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 @@ + You can find the sources for this Telco Edition of the Manual in + the directory branches/telcos/refman-5.1 of + the documentation repository. + + + If you have questions about using MySQL, you can ask them using our mailing lists or forums. See , and . 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 @@ Preface - 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 + . 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-x.y.z + to the version string. The first release of MySQL ¤t-series; + was MySQL 5.1.14/NDB-6.1.0-beta. All minor + versions of MySQL ¤t-series; contain 5.1.14 in + the version string; the Telco Edition releases are identified by + this NDB release number + (NDB-x.y.z). + - - 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/ ? - - - If you are using an earlier release of the MySQL software, please - refer to the &title-refman-previous;, which - provides coverage of MySQL &previous-series;, or to the - MySQL 3.23, 4.0, 4.1 Reference Manual, 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;.x). + + 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. 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 @@ ACID + + &innodb-warning; InnoDB 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 @@ Falcon storage engine - + 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 NDB Cluster, which is covered in . It also contains a description of - the pluggable storage engine architecture (see + the pluggable storage engine architecture (see ). - + For answers to some commonly asked questions about MySQL storage engines, see . @@ -122,7 +122,8 @@ - The MySQL pluggable storage engine architecture in shown in . + The MySQL pluggable storage engine architecture in shown in + .
@@ -397,8 +398,11 @@ source distributions, you can enable or disable either engine by configuring MySQL as you like. + + &innodb-warning; + - + Memory @@ -821,24 +825,19 @@ You can find more information on the list of third party storage engines on the - MySQL + MySQL Forge Storage Engines page. - - - Note - + 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. + - - 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 @@ - PrimeBase + PrimeBase XT (PBXT) — PBXT has been designed for modern, web-based, high concurrency environments. @@ -858,8 +856,7 @@ - RitmarkFS + RitmarkFS — 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 @@ - mdbtools + mdbtools — A pluggable storage engine that allows read-only - access to MicroSoft Access .mdb database - files. + access to Microsoft Access .mdb + database files. - solidDB + solidDB for MySQL — 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. @@ -907,8 +902,8 @@ For more information on developing a customer storage engine that can be used with the Pluggable Storage Engine Architecture, - see , of the MySQL Internals manual. + see , of the MySQL Internals + manual. @@ -1018,7 +1013,7 @@ - + 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. --> - + + + + + The presence in this Manual of information relating to the + InnoDB storage engine does not + constitute a license to use InnoDB commercially. You + must not compile, deploy, or make use of MySQL ¤t-series; + employing the InnoDB storage engine without prior + written permission to do so from MySQL AB. If you wish to use + InnoDB 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. + + '>