diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2012-03-02 17:16:52 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2012-03-02 17:16:52 +0000 |
| commit | 2ade1e916f308fef246811f6511aa27b7dd9d51b (patch) | |
| tree | 1fe5176cf80db2470c97b1b823a1e94ec5d9c75a /docs/ref/databases.txt | |
| parent | 3ed0b6ed64ff7a69644d1c1eacfb62b0aedadf71 (diff) | |
Edited stuff from [17543] to [17629]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/databases.txt')
| -rw-r--r-- | docs/ref/databases.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 1c4072b96c..58649dc077 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -155,13 +155,13 @@ MySQL has several `storage engines`_ (previously called table types). You can change the default storage engine in the server configuration. Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of -MyISAM are that it doesn't support transactions or enforce foreign keys +MyISAM are that it doesn't support transactions or enforce foreign-key constraints. On the plus side, it's currently the only engine that supports full-text indexing and searching. Since MySQL 5.5.5, the default storage engine is InnoDB_. This engine is fully transactional and supports foreign key references. It's probably the best -choice at this point in time. +choice at this point. .. versionchanged:: 1.4 |