Author: timo
Date: 2011-01-22 10:21:25 -0600 (Sat, 22 Jan 2011)
New Revision: 15283

Modified:
   django/branches/releases/1.2.X/docs/ref/databases.txt
Log:
[1.2.X] Fixed #15141 - remove some deprecated storage engines from the MySQL 
notes; thanks mariuz for the suggestion.

Backport of r15282 from trunk.

Modified: django/branches/releases/1.2.X/docs/ref/databases.txt
===================================================================
--- django/branches/releases/1.2.X/docs/ref/databases.txt       2011-01-22 
16:16:42 UTC (rev 15282)
+++ django/branches/releases/1.2.X/docs/ref/databases.txt       2011-01-22 
16:21:25 UTC (rev 15283)
@@ -136,22 +136,13 @@
 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.
+.. _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
 
-`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
-
 .. [#] 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
    the default storage engine, for example.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to