django1/django/db/backends/mysql
Andrew Godwin 03ec3219a0 Merge branch 'master' into schema-alteration
Conflicts:
	django/db/backends/mysql/introspection.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/creation.py
	django/db/models/base.py
	django/db/models/loading.py
2013-07-22 19:04:25 +01:00
..
__init__.py MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 2006-05-02 01:31:56 +00:00
base.py Merge branch 'master' into schema-alteration 2013-07-22 19:04:25 +01:00
client.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
compiler.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
creation.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
introspection.py Merge branch 'master' into schema-alteration 2013-07-22 19:04:25 +01:00
schema.py Fix NOT NULL sql for MySQL 2012-09-24 12:52:43 +01:00
validation.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00