aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorMelanie2011-06-13 12:38:17 +0100
committerMelanie2011-06-13 12:38:17 +0100
commit9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f (patch)
tree737d2847e8ea312e18ab96df2e2f6728e068381c /OpenSim/Data/MySQL
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentmatch water color for warp3d map tiler and adjust lighting (diff)
downloadopensim-SC-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.zip
opensim-SC-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.gz
opensim-SC-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.bz2
opensim-SC-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/Resources/FriendsStore.migrations2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 7848e49..55d82ec 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -25,8 +25,8 @@ COMMIT;
25 25
26BEGIN; 26BEGIN;
27 27
28ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
28ALTER TABLE `Friends` DROP PRIMARY KEY; 29ALTER TABLE `Friends` DROP PRIMARY KEY;
29ALTER TABLE `Friends` ADD PRIMARY KEY(PrincipalID(36), Friend(36)); 30ALTER TABLE `Friends` ADD PRIMARY KEY(PrincipalID(36), Friend(36));
30ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
31 31
32COMMIT; 32COMMIT;