Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 9 insertions, 27 deletions

diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 5de0e35..6840f07 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -1,32 +1,14 @@
-:VERSION 1       # -------------------------
+:VERSION 4       # -------------------------
 
 BEGIN;
 
-CREATE TABLE `Friends` (
-        `PrincipalID` CHAR(36) NOT NULL, 
-        `Friend` VARCHAR(255) NOT NULL, 
-        `Flags` VARCHAR(16) NOT NULL DEFAULT 0, 
-        `Offered` VARCHAR(32) NOT NULL DEFAULT 0, 
-        PRIMARY KEY(`PrincipalID`, `Friend`), 
-        KEY(`PrincipalID`)
-) ENGINE=MyISAM;
-
-COMMIT;
-
-:VERSION 2       # -------------------------
-
-BEGIN;
-
-INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
-
-COMMIT;
-
-:VERSION 3       # -------------------------
-
-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));
+CREATE TABLE IF NOT EXISTS `Friends` (
+  `PrincipalID` varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `Friend` varchar(255) NOT NULL,
+  `Flags` varchar(16) NOT NULL DEFAULT '0',
+  `Offered` varchar(32) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`PrincipalID`(36),`Friend`(36)),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;