Ticket #17573: 17573-1.diff

docs/ref/databases.txt

@@ -154 +154 @@
 MySQL has several `storage engines`_ (previously called table types). You can
 change the default storage engine in the server configuration.
 
-The default engine is MyISAM_ [#]_. The main drawbacks of MyISAM are that it
+Until MySQL 5.5.4, the default engine was MyISAM_ [#]_.
+The main drawbacks of MyISAM are that it
 doesn't currently support transactions or enforce foreign keys constraints. On
 the plus side, it's currently the only engine that supports full-text indexing
 and searching.
 
-The InnoDB_ engine is fully transactional and supports foreign key references
+Since MySQL 5.5.5, the default storage engine is InnoDB_. This engine is fully
+transactional and supports foreign key references
 and is probably the best choice at this point in time.
 
 .. versionchanged:: 1.4

docs/ref/django-admin.txt

@@ -371 +371 @@
 installation will be aborted, and any data installed in the call to
 ``loaddata`` will be removed from the database.
 
-.. admonition:: MySQL and Fixtures
-
-    Unfortunately, MySQL isn't capable of completely supporting all the
-    features of Django fixtures. If you use MyISAM tables, MySQL doesn't
-    support transactions or constraints, so you won't get a rollback if
-    multiple transaction files are found, or validation of fixture data.
-    If you use InnoDB tables, you won't be able to have any forward
-    references in your data files - MySQL doesn't provide a mechanism to
-    defer checking of row constraints until a transaction is committed.
+.. admonition:: MySQL (MyISAM) and Fixtures
+
+    Unfortunately, MySQL with MyISAM tables isn't capable of completely
+    supporting all the features of Django fixtures. The MyISAM storage engine
+    of MySQL doesn't support transactions or constraints, so you won't get a
+    rollback if multiple transaction files are found, or validation of fixture
+    data.
 
 Database-specific fixtures
 ~~~~~~~~~~~~~~~~~~~~~~~~~~