From f03c699159af53725b08aa5d8f7efb74b4662816 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 1 Nov 2013 10:43:27 +0100 Subject: [PATCH] [1.6.x] Fixed #21359 -- Corrected MySQL collation name in databases docs Thanks k_sze for the report. Backport of 67c6c1a7c from master. --- docs/ref/databases.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 884613a136d..960e7b88023 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -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