diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
| commit | fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (patch) | |
| tree | 72317b8a8c8950959b726834fbb6c5b23b66e51f /phpBB/develop | |
| parent | b9b1e13e70b2fa695f85321682ef2397f2936be4 (diff) | |
| parent | 7ca9c33157ad360750df8bf025a1155e14c6b2bb (diff) | |
| download | forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.gz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.bz2 forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.xz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[prep-release-3.0.9] Update Changelog for 3.0.9 release.
[prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
[ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
[ticket/10247] Add a db_tools test for the removal of a primary key column.
[ticket/10247] Add empty data section to database update for RC4
[ticket/10247] Remove unecessary attempt_id primary key column
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index f4d89e5562..efe8837b26 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1223,7 +1223,6 @@ function get_schema_struct() $schema_data['phpbb_login_attempts'] = array( 'COLUMNS' => array( - 'attempt_id' => array('UINT', NULL, 'auto_increment'), 'attempt_ip' => array('VCHAR:40', ''), 'attempt_browser' => array('VCHAR:150', ''), 'attempt_forwarded_for' => array('VCHAR:255', ''), @@ -1232,7 +1231,6 @@ function get_schema_struct() 'username' => array('VCHAR_UNI:255', 0), 'username_clean' => array('VCHAR_CI', 0), ), - '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')), |