[1.2.X] Fixed #13351: Added documentation about the cx_Oracle 'threaded' option to the oracle backend notes.

Backport of r14630 from trunk.

Thanks to Skaffen for the suggestion.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14632 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 14 insertions, 1 deletions

diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index bff3ec6840..d89e01dfa8 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -530,7 +530,7 @@ Your Django settings.py file should look something like this for Oracle::
             'USER': 'a_user',
             'PASSWORD': 'a_password',
             'HOST': '',
-            'PORT': ''     ,
+            'PORT': '',
         }
     }
 
@@ -553,6 +553,19 @@ recognizes the SID ("xe" in this example), then fill in both
 You should supply both ``HOST`` and ``PORT``, or leave both
 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::
+
+            'OPTIONS': {
+                'threaded': True,
+            },
+
+Failure to do this may result in crashes and other odd behavior.
+
 Tablespace options
 ------------------