summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Graham <timograham@gmail.com>2011-01-22 16:16:42 +0000
committerTimo Graham <timograham@gmail.com>2011-01-22 16:16:42 +0000
commit578ad9b472ba18b3fcdbe263e37002233fa859a2 (patch)
tree072aa14020a221611940dd3c2583e02d24ecb712
parenta757b5b8ca64d2fe8973e2a0696a12f9d10146d5 (diff)
Fixed #15141 - remove some deprecated storage engines from the MySQL notes; thanks mariuz for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/ref/databases.txt19
1 files changed, 5 insertions, 14 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index cd2bd4c987..85a5258be2 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -151,21 +151,12 @@ The default engine is MyISAM_ [#]_. The main drawback of MyISAM is that it
doesn't currently support transactions or foreign keys. 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.
+The InnoDB_ engine is fully transactional and supports foreign key references
+and is probably the best choice at this point in time.
-The BDB_ engine, like InnoDB, is also fully transactional and supports foreign
-key references. However, its use seems to be deprecated.
-
-`Other storage engines`_, including SolidDB_ and Falcon_, are on the horizon.
-For now, InnoDB is probably your best choice.
-
-.. _storage engines: http://dev.mysql.com/doc/refman/5.0/en/storage-engines.html
-.. _MyISAM: http://dev.mysql.com/doc/refman/5.0/en/myisam-storage-engine.html
-.. _BDB: http://dev.mysql.com/doc/refman/5.0/en/bdb-storage-engine.html
-.. _InnoDB: http://dev.mysql.com/doc/refman/5.0/en/innodb.html
-.. _Other storage engines: http://dev.mysql.com/doc/refman/5.1/en/storage-engines-other.html
-.. _SolidDB: http://forge.mysql.com/projects/project.php?id=139
-.. _Falcon: http://dev.mysql.com/doc/falcon/en/index.html
+.. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.html
+.. _MyISAM: http://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html
+.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb.html
.. [#] Unless this was changed by the packager of your MySQL package. We've
had reports that the Windows Community Server installer sets up InnoDB as