Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-06-13 12:38:17 +01:00
18 changed files with 1050 additions and 27 deletions

View File

@@ -25,8 +25,8 @@ COMMIT;
BEGIN;
ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE `Friends` DROP PRIMARY KEY;
ALTER TABLE `Friends` ADD PRIMARY KEY(PrincipalID(36), Friend(36));
ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
COMMIT;