diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:07:22 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:07:22 +0200 |
| commit | 5f73cdcdc295aeded117377496e9917c712f353f (patch) | |
| tree | 2ad2e330347030b4f0a81831aeab6fafad8db06b /phpBB/develop/create_schema_files.php | |
| parent | 1570a1e3b90b3f2d0402cd2530d0d030e27ab13e (diff) | |
| parent | fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (diff) | |
| download | forums-5f73cdcdc295aeded117377496e9917c712f353f.tar forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.gz forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.bz2 forums-5f73cdcdc295aeded117377496e9917c712f353f.tar.xz forums-5f73cdcdc295aeded117377496e9917c712f353f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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/install/database_update.php
Diffstat (limited to 'phpBB/develop/create_schema_files.php')
| -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 c0803f0f5c..213354fcb9 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1225,7 +1225,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', ''), @@ -1234,7 +1233,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')), |