Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.6.x] Fixed #21359 -- Corrected MySQL collation name in databases docs

Thanks k_sze for the report.
Backport of 67c6c1a from master.
  • Loading branch information...
commit f03c699159af53725b08aa5d8f7efb74b4662816 1 parent 8f104bb
Claude Paroz claudep authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 docs/ref/databases.txt
4 docs/ref/databases.txt
View
@@ -303,7 +303,7 @@ the model definition.
.. _documented thoroughly: http://dev.mysql.com/doc/refman/5.0/en/charset.html
By default, with a UTF-8 database, MySQL will use the
-``utf8_general_ci_swedish`` collation. This results in all string equality
+``utf8_general_ci`` collation. This results in all string equality
comparisons being done in a *case-insensitive* manner. That is, ``"Fred"`` and
``"freD"`` are considered equal at the database level. If you have a unique
constraint on a field, it would be illegal to try to insert both ``"aa"`` and
@@ -340,7 +340,7 @@ bytestrings (which shouldn't be too difficult) as described above is the
recommended solution.
Should you decide to use ``utf8_bin`` collation for some of your tables with
-MySQLdb 1.2.1p2 or 1.2.2, you should still use ``utf8_collation_ci_swedish``
+MySQLdb 1.2.1p2 or 1.2.2, you should still use ``utf8_general_ci``
(the default) collation for the ``django.contrib.sessions.models.Session``
table (usually called ``django_session``) and the
``django.contrib.admin.models.LogEntry`` table (usually called
Please sign in to comment.
Something went wrong with that request. Please try again.