Browse files

[1.7.x] Updated MySQL links to version 5.6.

Backport of fb4f3e0 from master
  • Loading branch information...
timgraham committed Aug 2, 2014
1 parent 893f188 commit 2ff2809c73e2b88c7ca8c236c48211b0570406f2
@@ -29,7 +29,8 @@ MySQL Spatial Limitations
MySQL's spatial extensions only support bounding box operations
(what MySQL calls minimum bounding rectangles, or MBR). Specifically,
-`MySQL does not conform to the OGC standard <>`_:
+`MySQL does not conform to the OGC standard
Currently, MySQL does not implement these functions
[``Contains``, ``Crosses``, ``Disjoint``, ``Intersects``, ``Overlaps``,
@@ -52,6 +53,7 @@ on a different spatial backend.
Creating and Saving Geographic Models
Here is an example of how to create a geometry object (assuming the ``Zipcode``
@@ -313,8 +315,8 @@ Method PostGIS Oracle SpatiaLite
.. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification <>`_, Revision 1.0 (June 16, 2008).
.. [#fndistsphere14] *See* `PostGIS 1.4 documentation <>`_ on ``ST_distance_sphere``.
.. [#fndistsphere15] *See* `PostGIS 1.5 documentation <>`_ on ``ST_distance_sphere``.
-.. [#fnmysqlidx] *See* `Creating Spatial Indexes <>`_
- in the MySQL 5.1 Reference Manual:
+.. [#fnmysqlidx] *See* `Creating Spatial Indexes <>`_
+ in the MySQL Reference Manual:
For MyISAM tables, ``SPATIAL INDEX`` creates an R-tree index. For storage
engines that support nonspatial indexing of spatial columns, the engine
@@ -196,17 +196,14 @@ Version support
Django supports MySQL 5.0.3 and higher.
-`MySQL 5.0`_ adds the ``information_schema`` database, which contains detailed
-data on all database schema. Django's ``inspectdb`` feature uses it.
+Django's ``inspectdb`` feature uses the ``information_schema`` database, which
+contains detailed data on all database schemas.
Django expects the database to support Unicode (UTF-8 encoding) and delegates to
it the task of enforcing transactions and referential integrity. It is important
to be aware of the fact that the two latter ones aren't actually enforced by
MySQL when using the MyISAM storage engine, see the next section.
-.. _MySQL:
-.. _MySQL 5.0:
.. _mysql-storage-engines:
Storage engines
@@ -237,9 +234,9 @@ running ``migrate``::
1005, "Can't create table '\\db_name\\.#sql-4a8_ab' (errno: 150)"
-.. _storage engines:
-.. _MyISAM:
-.. _InnoDB:
+.. _storage engines:
+.. _MyISAM:
+.. _InnoDB:
.. [#] 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
@@ -322,7 +319,7 @@ If you plan on using Django's :doc:`timezone support </topics/i18n/timezones>`,
use `mysql_tzinfo_to_sql`_ to load time zone tables into the MySQL database.
This needs to be done just once for your MySQL server, not per database.
-.. _mysql_tzinfo_to_sql:
+.. _mysql_tzinfo_to_sql:
Creating your database
@@ -333,7 +330,7 @@ You can `create your database`_ using the command-line tools and this SQL::
This ensures all tables and columns will use UTF-8 by default.
-.. _create your database:
+.. _create your database:
.. _mysql-collation:
@@ -347,7 +344,7 @@ the MySQL documentation. In all cases, you set the collation by directly
manipulating the database tables; Django doesn't provide a way to set this on
the model definition.
-.. _documented thoroughly:
+.. _documented thoroughly:
By default, with a UTF-8 database, MySQL will use the
``utf8_general_ci`` collation. This results in all string equality
@@ -445,7 +442,7 @@ Several other MySQLdb connection options may be useful, such as ``ssl``,
``init_command``, and ``sql_mode``. Consult the `MySQLdb documentation`_ for
more details.
-.. _MySQL option file:
+.. _MySQL option file:
.. _MySQLdb documentation:
Creating your tables
@@ -692,7 +692,7 @@ object. If it's ``None``, Django uses the :ref:`current time zone
.. _pytz:
.. _Time Zones:
.. _Choosing a Time Zone File:
- .. _mysql_tzinfo_to_sql:
+ .. _mysql_tzinfo_to_sql:
@@ -2602,8 +2602,7 @@ Note this is only available in MySQL and requires direct manipulation of the
database to add the full-text index. By default Django uses BOOLEAN MODE for
full text searches. See the `MySQL documentation`_ for additional details.
-.. _MySQL documentation:
+.. _MySQL documentation:
.. fieldlookup:: regex
@@ -641,7 +641,7 @@ Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``)
.. _PostgreSQL:
-.. _MySQL:
+.. _MySQL:
.. setting:: TEST_COLLATION
@@ -17,16 +17,16 @@ data. Normally, this means giving it an encoding of UTF-8 or UTF-16. If you use
a more restrictive encoding -- for example, latin1 (iso8859-1) -- you won't be
able to store certain characters in the database, and information will be lost.
-* MySQL users, refer to the `MySQL manual`_ (section for MySQL 5.1)
- for details on how to set or alter the database character set encoding.
+* MySQL users, refer to the `MySQL manual`_ for details on how to set or alter
+ the database character set encoding.
* PostgreSQL users, refer to the `PostgreSQL manual`_ (section 22.3.2 in
PostgreSQL 9) for details on creating databases with the correct encoding.
* SQLite users, there is nothing you need to do. SQLite always uses UTF-8
for internal encoding.
-.. _MySQL manual:
+.. _MySQL manual:
.. _PostgreSQL manual:
All of Django's database backends automatically convert Unicode strings into
@@ -491,7 +491,7 @@ pytz_. If you're using MySQL, you must install pytz_ and load the time zone
tables with `mysql_tzinfo_to_sql`_.
.. _pytz:
-.. _mysql_tzinfo_to_sql:
+.. _mysql_tzinfo_to_sql:
Addition of ``QuerySet.datetimes()``
@@ -474,7 +474,7 @@ function in autocommit mode: statements will be executed and committed as soon
as they're called. If your MySQL setup *does* support transactions, Django
will handle transactions as explained in this document.
-.. _information on MySQL transactions:
+.. _information on MySQL transactions:
Handling exceptions within PostgreSQL transactions

0 comments on commit 2ff2809

Please sign in to comment.