mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-05-17 12:26:29 +00:00
Code Issues 32 Releases Wiki Activity

Merge pull request #1377 from Matt-Stevens/doc-fixes-ref-databases

Browse Source 
Updated the `databases` documentation
This commit is contained in:
Tim Graham 2013-07-19 03:31:15 -07:00
commit 4aa006efd0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/ref/databases.txt
View File

@ -208,8 +208,8 @@ MySQL when using the MyISAM storage engine, see the next section.
Storage engines Storage engines
--------------- ---------------
MySQL has several `storage engines`_ (previously called table types). You can MySQL has several `storage engines`_. You can change the default storage engine
change the default storage engine in the server configuration. in the server configuration.
Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of 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-key MyISAM are that it doesn't support transactions or enforce foreign-key
@ -232,7 +232,7 @@ running ``syncdb``::
.. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.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 .. _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 .. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb-storage-engine.html
.. [#] Unless this was changed by the packager of your MySQL package. We've .. [#] 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 had reports that the Windows Community Server installer sets up InnoDB as
@ -718,9 +718,9 @@ as empty strings.
Threaded option Threaded option
---------------- ----------------
If you plan to run Django in a multithreaded environment (e.g. Apache in Windows If you plan to run Django in a multithreaded environment (e.g. Apache using the
using the default MPM module), then you **must** set the ``threaded`` option of the default MPM module on any modern operating system), then you **must** set
your Oracle database configuration to True:: the ``threaded`` option of your Oracle database configuration to True::
'OPTIONS': { 'OPTIONS': {
'threaded': True, 'threaded': True,