Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #17573 -- Documented MySQL's switch to InnoDB as default storag…

…e engine. Thanks Lenz Hirsch for the report and Claude Paroz for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0fe4218427ab293ade4075eef2a0fed29c6c0e51 1 parent 03aa030
Aymeric Augustin authored February 19, 2012
15  docs/ref/databases.txt
@@ -154,13 +154,14 @@ Storage engines
154 154
 MySQL has several `storage engines`_ (previously called table types). You can
155 155
 change the default storage engine in the server configuration.
156 156
 
157  
-The default engine is MyISAM_ [#]_. The main drawbacks of MyISAM are that it
158  
-doesn't currently support transactions or enforce foreign keys constraints. On
159  
-the plus side, it's currently the only engine that supports full-text indexing
160  
-and searching.
161  
-
162  
-The InnoDB_ engine is fully transactional and supports foreign key references
163  
-and is probably the best choice at this point in time.
  157
+Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of
  158
+MyISAM are that it doesn't support transactions or enforce foreign keys
  159
+constraints. On the plus side, it's currently the only engine that supports
  160
+full-text indexing and searching.
  161
+
  162
+Since MySQL 5.5.5, the default storage engine is InnoDB_. This engine is fully
  163
+transactional and supports foreign key references. It's probably the best
  164
+choice at this point in time.
164 165
 
165 166
 .. versionchanged:: 1.4
166 167
 
14  docs/ref/django-admin.txt
@@ -376,15 +376,11 @@ fixture type are discovered (for example, if ``mydata.json`` and
376 376
 installation will be aborted, and any data installed in the call to
377 377
 ``loaddata`` will be removed from the database.
378 378
 
379  
-.. admonition:: MySQL and Fixtures
380  
-
381  
-    Unfortunately, MySQL isn't capable of completely supporting all the
382  
-    features of Django fixtures. If you use MyISAM tables, MySQL doesn't
383  
-    support transactions or constraints, so you won't get a rollback if
384  
-    multiple transaction files are found, or validation of fixture data.
385  
-    If you use InnoDB tables, you won't be able to have any forward
386  
-    references in your data files - MySQL doesn't provide a mechanism to
387  
-    defer checking of row constraints until a transaction is committed.
  379
+.. admonition:: MySQL with MyISAM and fixtures
  380
+
  381
+    The MyISAM storage engine of MySQL doesn't support transactions or
  382
+    constraints, so you won't get a rollback if multiple transaction files are
  383
+    found, or validation of fixture data, if you use MyISAM tables.
388 384
 
389 385
 Database-specific fixtures
390 386
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

0 notes on commit 0fe4218

Please sign in to comment.
Something went wrong with that request. Please try again.