diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-06 23:20:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-06 23:20:41 +0200 |
| commit | 7b2f88686b313aebb64b6c7dade50df6a6c859c6 (patch) | |
| tree | 5e987fb30dd92091c3b1557f326a6461634d3210 /phpBB/install/database_update.php | |
| parent | 0a79930387ed9707f8c4cbca424820b107c9ac1d (diff) | |
| parent | 5eeb870442e01b3949489107ca80c584b36ff4ac (diff) | |
| download | forums-7b2f88686b313aebb64b6c7dade50df6a6c859c6.tar forums-7b2f88686b313aebb64b6c7dade50df6a6c859c6.tar.gz forums-7b2f88686b313aebb64b6c7dade50df6a6c859c6.tar.bz2 forums-7b2f88686b313aebb64b6c7dade50df6a6c859c6.tar.xz forums-7b2f88686b313aebb64b6c7dade50df6a6c859c6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10247] Remove attempt_id as primary key from database_update.php
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index f0fd640ebd..89c1d511cc 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1027,7 +1027,7 @@ function database_update_info() 'username' => array('VCHAR_UNI:255', 0), 'username_clean' => array('VCHAR_CI', 0), ), - 'PRIMARY_KEY' => 'attempt_id', + //'PRIMARY_KEY' => 'attempt_id', 'KEYS' => array( 'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')), 'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')), |