From d8d83777ebbe15af7587a24698435555ba3bb842 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 26 Dec 2013 15:50:33 -0500 Subject: [PATCH] Fixed #21629 -- Added instructions for loading MySQL time zone definitions. Thanks Aymeric for the suggestion. --- docs/ref/databases.txt | 11 +++++++++++ docs/topics/i18n/timezones.txt | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index f04b8830f7..f7c4f0f9fb 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -305,6 +305,17 @@ The Django adapter is currently only available in the Dev branch. .. _release branches: http://dev.mysql.com/downloads/connector/python/ +.. _mysql-time-zone-definitions: + +Time zone definitions +--------------------- + +If you plan on using Django's :doc:`timezone support `, +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: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html + Creating your database ---------------------- diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt index 5e3a482154..839813a823 100644 --- a/docs/topics/i18n/timezones.txt +++ b/docs/topics/i18n/timezones.txt @@ -649,6 +649,12 @@ Troubleshooting >>> local.date() datetime.date(2012, 3, 3) +4. **I get an error** "``Are time zone definitions for your database and pytz + installed?``" **pytz is installed, so I guess the problem is my database?** + + If you are using MySQL, see the :ref:`mysql-time-zone-definitions` section + of the MySQL notes for instructions on loading time zone definitions. + Usage -----