Merge lp:~hrvojem/percona-server/doc-103-5.6 into lp:percona-server/5.6

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 658
Proposed branch: lp:~hrvojem/percona-server/doc-103-5.6
Merge into: lp:percona-server/5.6
Diff against target: 43 lines (+9/-4)
2 files modified
doc/source/tokudb/tokudb_installation.rst (+4/-2)
doc/source/tokudb/tokudb_intro.rst (+5/-2)
To merge this branch: bzr merge lp:~hrvojem/percona-server/doc-103-5.6
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+233904@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/tokudb/tokudb_installation.rst'
--- doc/source/tokudb/tokudb_installation.rst 2014-08-04 14:26:46 +0000
+++ doc/source/tokudb/tokudb_installation.rst 2014-09-09 10:57:39 +0000
@@ -4,12 +4,14 @@
4 TokuDB Installation4 TokuDB Installation
5=====================5=====================
66
7|Percona Server| is compatible with the separately available TokuDB storage engine package. TokuDB engine is not packaged with any |Percona Server| 5.6 download. The TokuDB engine must be separately downloaded and then enabled as a plug-in component.  This package can be installed alongside with standard |Percona Server| 5.6 releases starting with :rn:`5.6.19-67.0` and does not require any specially adapted version of |Percona Server|.7|Percona Server| is technically compatible with the separately available TokuDB storage engine package. TokuDB engine is not packaged with any |Percona Server| 5.6 download. The TokuDB engine must be separately downloaded and then enabled as a plug-in component.  This package can be installed alongside with standard |Percona Server| 5.6 releases starting with :rn:`5.6.19-67.0` and does not require any specially adapted version of |Percona Server|.
88
9`TokuDB <http://www.tokutek.com/products/tokudb-for-mysql/>`_ is a scalable, ACID and MVCC compliant storage engine that provides indexing-based query improvements, offers online schema modifications, and reduces slave lag for both hard disk drives and flash memory. This storage engine is specifically designed for high performance on write-intensive workloads which is achieved with Fractal Tree indexing.9The `TokuDB <http://www.tokutek.com/products/tokudb-for-mysql/>`_ storage engine is a scalable, ACID and MVCC compliant storage engine that provides indexing-based query improvements, offers online schema modifications, and reduces slave lag for both hard disk drives and flash memory. This storage engine is specifically designed for high performance on write-intensive workloads which is achieved with Fractal Tree indexing.
1010
11Only the `Percona supplied <http://www.percona.com/downloads/Percona-Server-5.6/LATEST/>`_ TokuDB engine should be used with |Percona Server| 5.6. A TokuDB engine downloaded from other sources is not necessarily compatible.11Only the `Percona supplied <http://www.percona.com/downloads/Percona-Server-5.6/LATEST/>`_ TokuDB engine should be used with |Percona Server| 5.6. A TokuDB engine downloaded from other sources is not necessarily compatible.
1212
13The TokuDB engine is released by Tokutek Inc. under a modified form of the GNU GPL v2 license. You can view a copy of the modified license `here <https://github.com/Tokutek/ft-index/blob/master/README-TOKUDB>`_.
14
13TokuDB Hot Backup is a proprietary, commercial product available for download only from `Tokutek.com <http://www.tokutek.com/subscriptions/>`_. It is not available for download from Percona.15TokuDB Hot Backup is a proprietary, commercial product available for download only from `Tokutek.com <http://www.tokutek.com/subscriptions/>`_. It is not available for download from Percona.
1416
15TokuDB is currently supported only for 64-bit Linux distributions. It is not available for Debian 6.0 (squeeze) and Ubuntu 10.04 (lucid) due to conflicts with the gcc version required by TokuDB.17TokuDB is currently supported only for 64-bit Linux distributions. It is not available for Debian 6.0 (squeeze) and Ubuntu 10.04 (lucid) due to conflicts with the gcc version required by TokuDB.
1618
=== modified file 'doc/source/tokudb/tokudb_intro.rst'
--- doc/source/tokudb/tokudb_intro.rst 2014-08-04 14:26:46 +0000
+++ doc/source/tokudb/tokudb_intro.rst 2014-09-09 10:57:39 +0000
@@ -4,9 +4,9 @@
4 TokuDB Introduction4 TokuDB Introduction
5=====================5=====================
66
7|Percona Server| is compatible with the separately available TokuDB storage engine package. TokuDB engine is not packaged with any |Percona Server| 5.6 download. The TokuDB engine must be separately downloaded and then enabled as a plug-in component.  This package can be installed alongside with standard |Percona Server| 5.6 releases starting with :rn:`5.6.19-67.0` and does not require any specially adapted version of |Percona Server|.7|Percona Server| is technically compatible with the separately available TokuDB storage engine package. TokuDB engine is not packaged with any |Percona Server| 5.6 download. The TokuDB engine must be separately downloaded and then enabled as a plug-in component. This package can be installed alongside standard |Percona Server| 5.6 releases starting with :rn:`5.6.19-67.0` and does not require any specially adapted version of |Percona Server|.
88
9TokuDB is a scalable, ACID and MVCC compliant storage engine that provides indexing-based query improvements, offers online schema modifications, and reduces slave lag for both hard disk drives and flash memory. This storage engine is specifically designed for high performance on write-intensive workloads which is achieved with Fractal Tree indexing.9The TokuDB storage engine is a scalable, ACID and MVCC compliant storage engine that provides indexing-based query improvements, offers online schema modifications, and reduces slave lag for both hard disk drives and flash memory. This storage engine is specifically designed for high performance on write-intensive workloads which is achieved with Fractal Tree indexing.
1010
11Key TokuDB features available in the current production release: 11Key TokuDB features available in the current production release:
1212
@@ -21,3 +21,6 @@
21 * `Fast Updates with NOAR <http://www.tokutek.com/2013/02/fast-updates-with-tokudb/>`_21 * `Fast Updates with NOAR <http://www.tokutek.com/2013/02/fast-updates-with-tokudb/>`_
22 * `TokuDB AUTOINCREMENT implementation <http://www.tokutek.com/2009/07/autoincrement_semantics/>`_22 * `TokuDB AUTOINCREMENT implementation <http://www.tokutek.com/2009/07/autoincrement_semantics/>`_
2323
24TokuDB is released by Tokutek Inc. under a modified form of the GNU GPL v2 license. You can view a copy of the modified license `here <https://github.com/Tokutek/ft-index/blob/master/README-TOKUDB>`_.
25
26

Subscribers

People subscribed via source and target branches