summaryrefslogtreecommitdiff
path: root/docs/ref/databases.txt
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-02-19 07:39:05 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-02-19 07:39:05 +0000
commit0fe4218427ab293ade4075eef2a0fed29c6c0e51 (patch)
tree3b342b8ab5f9c7054bbd9e2cc5b9927e676a9bf9 /docs/ref/databases.txt
parent03aa030f07b4b75add143f895f18fd7d54f770ca (diff)
Fixed #17573 -- Documented MySQL's switch to InnoDB as default storage 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
Diffstat (limited to 'docs/ref/databases.txt')
-rw-r--r--docs/ref/databases.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 85631a7345..1c4072b96c 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -154,13 +154,14 @@ Storage engines
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
-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.
+Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of
+MyISAM are that it doesn't 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
-and is probably the best choice at this point in time.
+Since MySQL 5.5.5, the default storage engine is InnoDB_. This engine is fully
+transactional and supports foreign key references. It's probably the best
+choice at this point in time.
.. versionchanged:: 1.4