innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #14536 -- Corrected DB connection OPTIONS examples in documentation. Thanks denilsonsa for reporting the error. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2010-11-14 14:15:58 +00:00
parent ff63a5bdec
commit 2b344d2628
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

@ -73,8 +73,8 @@ autocommit behavior is enabled by setting the ``autocommit`` key in
the :setting:`OPTIONS` part of your database configuration in the :setting:`OPTIONS` part of your database configuration in
:setting:`DATABASES`:: :setting:`DATABASES`::
OPTIONS = { 'OPTIONS': {
"autocommit": True, 'autocommit': True,
} }
In this configuration, Django still ensures that :ref:`delete() In this configuration, Django still ensures that :ref:`delete()
@ -325,8 +325,8 @@ storage engine, you have a couple of options.
* Another option is to use the ``init_command`` option for MySQLdb prior to * Another option is to use the ``init_command`` option for MySQLdb prior to
creating your tables:: creating your tables::
OPTIONS = { 'OPTIONS': {
"init_command": "SET storage_engine=INNODB", 'init_command': 'SET storage_engine=INNODB',
} }
This sets the default storage engine upon connecting to the database. This sets the default storage engine upon connecting to the database.
@ -489,9 +489,9 @@ If you're getting this error, you can solve it by:
* Increase the default timeout value by setting the ``timeout`` database * Increase the default timeout value by setting the ``timeout`` database
option option:: option option::
OPTIONS = { 'OPTIONS': {
# ... # ...
"timeout": 20, 'timeout': 20,
# ... # ...
} }