Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
This commit is contained in:
Andreas Fischer 2011-07-06 23:20:41 +02:00
commit 7b2f88686b

View file

@ -1027,7 +1027,7 @@ function database_update_info()
'username' => array('VCHAR_UNI:255', 0), 'username' => array('VCHAR_UNI:255', 0),
'username_clean' => array('VCHAR_CI', 0), 'username_clean' => array('VCHAR_CI', 0),
), ),
'PRIMARY_KEY' => 'attempt_id', //'PRIMARY_KEY' => 'attempt_id',
'KEYS' => array( 'KEYS' => array(
'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')), 'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')), 'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),