1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

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
This commit is contained in:
Andreas Fischer
2011-07-05 01:07:22 +02:00
12 changed files with 42 additions and 58 deletions

View File

@@ -361,7 +361,6 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
attempt_id INTEGER PRIMARY KEY NOT NULL ,
attempt_ip varchar(40) NOT NULL DEFAULT '',
attempt_browser varchar(150) NOT NULL DEFAULT '',
attempt_forwarded_for varchar(255) NOT NULL DEFAULT '',