Mikael Nordfeldth b54710950f unique keys and indexes must be NOT NULL or MySQL fucks up ...

If this merge throws exception on scripts/upgrade.php and you recently
tried a nightly (i.e. during 2015-02-19) then just go back a commit or two
and try again.

Or delete the duplicate entries. Find the entries like this:

SELECT COUNT(*), urlhash FROM file_redirection
    GROUP BY urlhash
    HAVING COUNT(*) > 1;

then for each urlhash (or come up with a smart SQL query) do:
DELETE FROM file_redirection WHERE urlhash='hashfrompreviousquery' LIMIT 1;

You'll have to remove duplicates more than once if you have >2 identical
urlhash entries. LIMIT -1 might do that for you. I'm not sure.

2015-02-19 21:21:39 +01:00

..

Attention.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Avatar.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Config.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Confirm_address.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Consumer.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Conversation.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Deleted_notice.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

File_redirection.php

unique keys and indexes must be NOT NULL or MySQL fucks up

2015-02-19 21:21:39 +01:00

File_thumbnail.php

Merge branch 'utf8mb4' into nightly

2015-02-19 20:50:40 +01:00

File_to_post.php

function delete in dataobjects now don't break strict syntax

2013-10-29 10:20:57 +01:00

File.php

unique keys and indexes must be NOT NULL or MySQL fucks up

2015-02-19 21:21:39 +01:00

Foreign_link.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Foreign_service.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Foreign_subscription.php

staticGet for sub-Managed_DataObject classes now calls parent

2013-08-12 19:46:44 +02:00

Foreign_user.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Group_alias.php

Local_group and User are now assumed to be in same namespace

2013-10-17 01:27:01 +02:00

Group_block.php

Minor typing stuff and syntax fixes

2013-11-02 17:28:11 +01:00

Group_inbox.php

pkeyGet is now static and more similar to getKV

2013-08-18 15:42:51 +02:00

Group_join_queue.php

pkeyGet is now static and more similar to getKV

2013-08-18 15:42:51 +02:00

Group_member.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Invitation.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Local_group.php

Implement a User_group fetching function for Local_group

2013-11-02 17:27:50 +01:00

Location_namespace.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Login_token.php

Replace common_good_random with common_random_hexstr

2013-10-21 13:20:30 +02:00

Managed_DataObject.php

File and File_redirection adhoc storage methods updated for urlhash

2015-02-19 19:05:24 +01:00

Memcached_DataObject.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Nonce.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Notice_source.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Notice_tag.php

pkeyGet is now static and more similar to getKV

2013-08-18 15:42:51 +02:00

Notice.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Oauth_application_user.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Oauth_application.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Oauth_token_association.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Old_school_prefs.php

Updating all Memcached_DataObject extended classes to Managed_DataObject

2013-08-18 12:32:32 +02:00

Profile_block.php

Declaring some more static functions properly

2013-09-09 23:28:20 +02:00

Profile_list.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Profile_prefs.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Profile_role.php

pkeyGet is now static and more similar to getKV

2013-08-18 15:42:51 +02:00

Profile_tag_subscription.php

function delete in dataobjects now don't break strict syntax

2013-10-29 10:20:57 +01:00

Profile_tag.php

function delete in dataobjects now don't break strict syntax

2013-10-29 10:20:57 +01:00

Profile.php

Merge branch 'utf8mb4' into nightly

2015-02-19 20:50:40 +01:00

Queue_item.php

8 chars was too little, 32 should be enough.

2013-09-18 01:21:53 +02:00

Related_group.php

staticGet for sub-Managed_DataObject classes now calls parent

2013-08-12 19:46:44 +02:00

Remember_me.php

staticGet for sub-Managed_DataObject classes now calls parent

2013-08-12 19:46:44 +02:00

Reply.php

pkeyGet is now static and more similar to getKV

2013-08-18 15:42:51 +02:00

Safe_DataObject.php

function delete in dataobjects now don't break strict syntax

2013-10-29 10:20:57 +01:00

Schema_version.php

staticGet for sub-Managed_DataObject classes now calls parent

2013-08-12 19:46:44 +02:00

Session.php

The overloaded DB_DataObject function staticGet is now called getKV

2013-08-18 13:13:56 +02:00

Sms_carrier.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Status_network_tag.php

function delete in dataobjects now don't break strict syntax

2013-10-29 10:20:57 +01:00

status_network.ini

oops. really embarassing typo (that explains some weird behaviour)

2010-07-29 16:32:41 -04:00

Status_network.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Subscription_queue.php

More modern coding, stuff related to subscriptions

2014-05-05 23:58:05 +02:00

Subscription.php

Merge branch 'utf8mb4' into nightly

2015-02-19 20:50:40 +01:00

Token.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

Unavailable_status_network.php

Updating all Memcached_DataObject extended classes to Managed_DataObject

2013-08-18 12:32:32 +02:00

User_group.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

User_im_prefs.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

User_location_prefs.php

staticGet for sub-Managed_DataObject classes now calls parent

2013-08-12 19:46:44 +02:00

User_urlshortener_prefs.php

Fixed CHMOD + set error_reporting(0) in getvaliddaemons.php to avoid strict warnings in PHP +5.5

2014-08-24 13:12:44 +02:00

User_username.php

utf8mb4 conversion on database with index adjusts

2015-02-12 18:18:55 +01:00

User.php

Merge branch 'utf8mb4' into nightly

2015-02-19 20:50:40 +01:00