Merge lp:~stewart/drizzle/bug744206 into lp:~drizzle-trunk/drizzle/development

Proposed by Stewart Smith
Status: Merged
Approved by: Mark Atwood
Approved revision: 2505
Merged at revision: 2508
Proposed branch: lp:~stewart/drizzle/bug744206
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 25 lines (+7/-8)
1 file modified
docs/mysql_differences.rst (+7/-8)
To merge this branch: bzr merge lp:~stewart/drizzle/bug744206
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+92657@code.launchpad.net

Description of the change

simple docs update for current state of storage engines in drizzle.

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 'docs/mysql_differences.rst'
--- docs/mysql_differences.rst 2011-08-13 20:41:38 +0000
+++ docs/mysql_differences.rst 2012-02-12 05:44:18 +0000
@@ -139,14 +139,13 @@
139Storage Engines139Storage Engines
140---------------140---------------
141141
142 * MERGE storage engine has been removed142The default Storage Engine is InnoDB and the MyISAM storage engine only exists for temporary tables only. In a future release, it will not be user accessible at all.
143 * FEDERATED storage engine has been removed (all current development is143
144 focused on FederatedX, so having FEDERATED made no sense).144A number of storage engines have been removed:
145 * CSV engine is now for temporary tables only. See the filesystem_engine for145 * MERGE - this was always a interim solution to the absence of SQL VIEWs
146 the future of reading files as database tables.146 * FEDERATED - it is effectively unmaintanied, with any recent development occuring in FederatedX
147 * MyISAM is for temporary tables only.147 * CSV
148 * ARCHIVE is fully supported148 * ARCHIVE
149 * PBXT is merged
150149
151FRM Files150FRM Files
152---------151---------