diff options
| author | Matt Deacalion Stevens <matt@dirtymonkey.co.uk> | 2013-07-19 09:01:13 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-19 06:31:48 -0400 |
| commit | 9386bbc75f23a8b9bd747eb3b37bc220fe04563b (patch) | |
| tree | dd2bafcee7f06aa45cbe9d2dfce6877fb8fa050d /docs | |
| parent | c89cc4fc2932efc5fe89a5f3c2ce4795e5928c40 (diff) | |
[1.5.x] Updated the `databases` documentation
+ Removed a reference about MySQL storage engines also being
called 'table types', as this term has been deprecated for
8 years and is no longer used.
+ Fixed the link to the official InnoDB storage engine docs.
+ Apache (versions >= 2.4) will always choose a multi-threaded
MPM module on modern operating systems (later than 2002).
Backport of fa217d14a0 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/databases.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 35e75f1140..bf2c084bd7 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -151,8 +151,8 @@ MySQL when using the MyISAM storage engine, see the next section. Storage engines --------------- -MySQL has several `storage engines`_ (previously called table types). You can -change the default storage engine in the server configuration. +MySQL has several `storage engines`_. You can change the default storage engine +in the server configuration. 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 @@ -187,7 +187,7 @@ key references and an `IntegrityError` is raised if any are found. .. _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 +.. _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 had reports that the Windows Community Server installer sets up InnoDB as @@ -655,9 +655,9 @@ as empty strings. Threaded option ---------------- -If you plan to run Django in a multithreaded environment (e.g. Apache in Windows -using the default MPM module), then you **must** set the ``threaded`` option of -your Oracle database configuration to True:: +If you plan to run Django in a multithreaded environment (e.g. Apache using the +the default MPM module on any modern operating system), then you **must** set +the ``threaded`` option of your Oracle database configuration to True:: 'OPTIONS': { 'threaded': True, |