diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 00:27:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 00:27:04 +0200 |
| commit | f5d86d06040de198d15fe9596c63186da02347d8 (patch) | |
| tree | 23616fb831fef47ea8665aef55cf2594eb59b3fd /phpBB/develop | |
| parent | ffa6f3448fdfe6d076c894231ebbd59e3b51e2ba (diff) | |
| parent | cb7604dcd83bf3a4ddf6ace1282974eaf475c8d8 (diff) | |
| download | forums-f5d86d06040de198d15fe9596c63186da02347d8.tar forums-f5d86d06040de198d15fe9596c63186da02347d8.tar.gz forums-f5d86d06040de198d15fe9596c63186da02347d8.tar.bz2 forums-f5d86d06040de198d15fe9596c63186da02347d8.tar.xz forums-f5d86d06040de198d15fe9596c63186da02347d8.zip | |
Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9
* naderman/ticket/10247:
[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
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')), |