aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/Resources
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-11-03 21:44:39 +1000
committerDavid Walter Seikel2016-11-03 21:44:39 +1000
commit134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch)
tree216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Data/MySQL/Resources
parentMore changing to production grid. Double oops. (diff)
downloadopensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip
opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz
opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2
opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/Resources/AgentPrefs.migrations18
-rw-r--r--OpenSim/Data/MySQL/Resources/AssetStore.migrations6
-rw-r--r--OpenSim/Data/MySQL/Resources/AuthStore.migrations4
-rw-r--r--OpenSim/Data/MySQL/Resources/EstateStore.migrations18
-rw-r--r--OpenSim/Data/MySQL/Resources/FSAssetStore.migrations18
-rw-r--r--OpenSim/Data/MySQL/Resources/FriendsStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/GridStore.migrations6
-rw-r--r--OpenSim/Data/MySQL/Resources/GridUserStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/HGTravelStore.migrations18
-rw-r--r--OpenSim/Data/MySQL/Resources/IM_Store.migrations42
-rw-r--r--OpenSim/Data/MySQL/Resources/InventoryStore.migrations4
-rw-r--r--OpenSim/Data/MySQL/Resources/LogStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/Presence.migrations12
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations70
-rw-r--r--OpenSim/Data/MySQL/Resources/UserAccount.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/UserProfiles.migrations (renamed from sql/osprofile.sql)32
-rw-r--r--OpenSim/Data/MySQL/Resources/UserStore.migrations10
-rw-r--r--OpenSim/Data/MySQL/Resources/XAssetStore.migrations41
-rw-r--r--OpenSim/Data/MySQL/Resources/os_groups_Store.migrations115
19 files changed, 368 insertions, 54 deletions
diff --git a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
new file mode 100644
index 0000000..e496f72
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
@@ -0,0 +1,18 @@
1:VERSION 1 # -------------------------
2
3BEGIN;
4
5CREATE TABLE `AgentPrefs` (
6 `PrincipalID` CHAR(36) NOT NULL,
7 `AccessPrefs` CHAR(2) NOT NULL DEFAULT 'M',
8 `HoverHeight` DOUBLE(30, 27) NOT NULL DEFAULT 0,
9 `Language` CHAR(5) NOT NULL DEFAULT 'en-us',
10 `LanguageIsPublic` BOOLEAN NOT NULL DEFAULT 1,
11 `PermEveryone` INT(6) NOT NULL DEFAULT 0,
12 `PermGroup` INT(6) NOT NULL DEFAULT 0,
13 `PermNextOwner` INT(6) NOT NULL DEFAULT 532480,
14 UNIQUE KEY `PrincipalID` (`PrincipalID`),
15 PRIMARY KEY(`PrincipalID`)
16) ENGINE=InnoDB DEFAULT CHARSET=utf8;
17
18COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
index f7211c2..661d825 100644
--- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -13,7 +13,7 @@ CREATE TABLE `assets` (
13 `temporary` tinyint(1) NOT NULL, 13 `temporary` tinyint(1) NOT NULL,
14 `data` longblob NOT NULL, 14 `data` longblob NOT NULL,
15 PRIMARY KEY (`id`) 15 PRIMARY KEY (`id`)
16) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; 16) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
17 17
18COMMIT; 18COMMIT;
19 19
@@ -75,3 +75,7 @@ ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
75 75
76ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT ''; 76ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT '';
77 77
78:VERSION 9
79
80BEGIN;
81COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AuthStore.migrations b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
index 9450940..023c786 100644
--- a/OpenSim/Data/MySQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
@@ -8,7 +8,7 @@ CREATE TABLE `auth` (
8 `passwordSalt` char(32) NOT NULL default '', 8 `passwordSalt` char(32) NOT NULL default '',
9 `webLoginKey` varchar(255) NOT NULL default '', 9 `webLoginKey` varchar(255) NOT NULL default '',
10 PRIMARY KEY (`UUID`) 10 PRIMARY KEY (`UUID`)
11) ENGINE=MyISAM; 11) ENGINE=InnoDB;
12 12
13CREATE TABLE `tokens` ( 13CREATE TABLE `tokens` (
14 `UUID` char(36) NOT NULL, 14 `UUID` char(36) NOT NULL,
@@ -18,7 +18,7 @@ CREATE TABLE `tokens` (
18 KEY `UUID` (`UUID`), 18 KEY `UUID` (`UUID`),
19 KEY `token` (`token`), 19 KEY `token` (`token`),
20 KEY `validity` (`validity`) 20 KEY `validity` (`validity`)
21) ENGINE=MyISAM; 21) ENGINE=InnoDB;
22 22
23commit; 23commit;
24 24
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index 6ef92ee..2d1c2b5 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -10,19 +10,19 @@ CREATE TABLE IF NOT EXISTS `estate_managers` (
10 `EstateID` int(10) unsigned NOT NULL, 10 `EstateID` int(10) unsigned NOT NULL,
11 `uuid` char(36) NOT NULL, 11 `uuid` char(36) NOT NULL,
12 KEY `EstateID` (`EstateID`) 12 KEY `EstateID` (`EstateID`)
13) ENGINE=MyISAM; 13) ENGINE=InnoDB;
14 14
15CREATE TABLE IF NOT EXISTS `estate_groups` ( 15CREATE TABLE IF NOT EXISTS `estate_groups` (
16 `EstateID` int(10) unsigned NOT NULL, 16 `EstateID` int(10) unsigned NOT NULL,
17 `uuid` char(36) NOT NULL, 17 `uuid` char(36) NOT NULL,
18 KEY `EstateID` (`EstateID`) 18 KEY `EstateID` (`EstateID`)
19) ENGINE=MyISAM; 19) ENGINE=InnoDB;
20 20
21CREATE TABLE IF NOT EXISTS `estate_users` ( 21CREATE TABLE IF NOT EXISTS `estate_users` (
22 `EstateID` int(10) unsigned NOT NULL, 22 `EstateID` int(10) unsigned NOT NULL,
23 `uuid` char(36) NOT NULL, 23 `uuid` char(36) NOT NULL,
24 KEY `EstateID` (`EstateID`) 24 KEY `EstateID` (`EstateID`)
25) ENGINE=MyISAM; 25) ENGINE=InnoDB;
26 26
27CREATE TABLE IF NOT EXISTS `estateban` ( 27CREATE TABLE IF NOT EXISTS `estateban` (
28 `EstateID` int(10) unsigned NOT NULL, 28 `EstateID` int(10) unsigned NOT NULL,
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `estateban` (
31 `bannedIpHostMask` varchar(16) NOT NULL, 31 `bannedIpHostMask` varchar(16) NOT NULL,
32 `bannedNameMask` varchar(64) default NULL, 32 `bannedNameMask` varchar(64) default NULL,
33 KEY `estateban_EstateID` (`EstateID`) 33 KEY `estateban_EstateID` (`EstateID`)
34) ENGINE=MyISAM; 34) ENGINE=InnoDB;
35 35
36CREATE TABLE IF NOT EXISTS `estate_settings` ( 36CREATE TABLE IF NOT EXISTS `estate_settings` (
37 `EstateID` int(10) unsigned NOT NULL auto_increment, 37 `EstateID` int(10) unsigned NOT NULL auto_increment,
@@ -60,14 +60,14 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
60 `DenyMinors` tinyint not null, 60 `DenyMinors` tinyint not null,
61 61
62 PRIMARY KEY (`EstateID`) 62 PRIMARY KEY (`EstateID`)
63) ENGINE=MyISAM AUTO_INCREMENT=100; 63) ENGINE=InnoDB AUTO_INCREMENT=100;
64 64
65CREATE TABLE IF NOT EXISTS `estate_map` ( 65CREATE TABLE IF NOT EXISTS `estate_map` (
66 `RegionID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000', 66 `RegionID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
67 `EstateID` int(11) NOT NULL, 67 `EstateID` int(11) NOT NULL,
68 PRIMARY KEY (`RegionID`), 68 PRIMARY KEY (`RegionID`),
69 KEY `EstateID` (`EstateID`) 69 KEY `EstateID` (`EstateID`)
70) ENGINE=MyISAM; 70) ENGINE=InnoDB;
71 71
72COMMIT; 72COMMIT;
73 73
@@ -77,5 +77,11 @@ BEGIN;
77ALTER TABLE estate_settings AUTO_INCREMENT = 100; 77ALTER TABLE estate_settings AUTO_INCREMENT = 100;
78COMMIT; 78COMMIT;
79 79
80:VERSION 33 #---------------------
80 81
82BEGIN;
83ALTER TABLE estate_settings ADD COLUMN `AllowLandmark` tinyint(4) NOT NULL default '1';
84ALTER TABLE estate_settings ADD COLUMN `AllowParcelChanges` tinyint(4) NOT NULL default '1';
85ALTER TABLE estate_settings ADD COLUMN `AllowSetHome` tinyint(4) NOT NULL default '1';
86COMMIT;
81 87
diff --git a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
new file mode 100644
index 0000000..87d08c6
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
@@ -0,0 +1,18 @@
1# -----------------
2:VERSION 1
3
4BEGIN;
5
6CREATE TABLE `fsassets` (
7 `id` char(36) NOT NULL,
8 `name` varchar(64) NOT NULL DEFAULT '',
9 `description` varchar(64) NOT NULL DEFAULT '',
10 `type` int(11) NOT NULL,
11 `hash` char(80) NOT NULL,
12 `create_time` int(11) NOT NULL DEFAULT '0',
13 `access_time` int(11) NOT NULL DEFAULT '0',
14 `asset_flags` int(11) NOT NULL DEFAULT '0',
15 PRIMARY KEY (`id`)
16) ENGINE=InnoDB DEFAULT CHARSET=utf8;
17
18COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 55d82ec..5faf956 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -9,7 +9,7 @@ CREATE TABLE `Friends` (
9 `Offered` VARCHAR(32) NOT NULL DEFAULT 0, 9 `Offered` VARCHAR(32) NOT NULL DEFAULT 0,
10 PRIMARY KEY(`PrincipalID`, `Friend`), 10 PRIMARY KEY(`PrincipalID`, `Friend`),
11 KEY(`PrincipalID`) 11 KEY(`PrincipalID`)
12); 12) ENGINE=InnoDB;
13 13
14COMMIT; 14COMMIT;
15 15
diff --git a/OpenSim/Data/MySQL/Resources/GridStore.migrations b/OpenSim/Data/MySQL/Resources/GridStore.migrations
index b010c63..b8d287a 100644
--- a/OpenSim/Data/MySQL/Resources/GridStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridStore.migrations
@@ -1,5 +1,7 @@
1:VERSION 1 1:VERSION 1
2 2
3BEGIN;
4
3CREATE TABLE `regions` ( 5CREATE TABLE `regions` (
4 `uuid` varchar(36) NOT NULL, 6 `uuid` varchar(36) NOT NULL,
5 `regionHandle` bigint(20) unsigned NOT NULL, 7 `regionHandle` bigint(20) unsigned NOT NULL,
@@ -31,7 +33,9 @@ CREATE TABLE `regions` (
31 KEY `regionName` (`regionName`), 33 KEY `regionName` (`regionName`),
32 KEY `regionHandle` (`regionHandle`), 34 KEY `regionHandle` (`regionHandle`),
33 KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`) 35 KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
34) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Rev. 3'; 36) ENGINE=InnoDB DEFAULT CHARSET=utf8;
37
38COMMIT;
35 39
36:VERSION 2 40:VERSION 2
37 41
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index e2be27e..d08e096 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -14,7 +14,7 @@ CREATE TABLE `GridUser` (
14 `Login` CHAR(16) NOT NULL DEFAULT '0', 14 `Login` CHAR(16) NOT NULL DEFAULT '0',
15 `Logout` CHAR(16) NOT NULL DEFAULT '0', 15 `Logout` CHAR(16) NOT NULL DEFAULT '0',
16 PRIMARY KEY (`UserID`) 16 PRIMARY KEY (`UserID`)
17) ENGINE=MyISAM; 17) ENGINE=InnoDB;
18 18
19COMMIT; 19COMMIT;
20 20
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..b4e4422
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,18 @@
1:VERSION 1 # --------------------------
2
3BEGIN;
4
5CREATE TABLE `hg_traveling_data` (
6 `SessionID` VARCHAR(36) NOT NULL,
7 `UserID` VARCHAR(36) NOT NULL,
8 `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '',
9 `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '',
10 `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
11 `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
12 `TMStamp` timestamp NOT NULL,
13 PRIMARY KEY (`SessionID`),
14 KEY (`UserID`)
15) ENGINE=InnoDB;
16
17COMMIT;
18
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
new file mode 100644
index 0000000..79ead98
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
@@ -0,0 +1,42 @@
1:VERSION 1 # --------------------------
2
3BEGIN;
4
5CREATE TABLE `im_offline` (
6 `ID` MEDIUMINT NOT NULL AUTO_INCREMENT,
7 `PrincipalID` char(36) NOT NULL default '',
8 `Message` text NOT NULL,
9 `TMStamp` timestamp NOT NULL,
10 PRIMARY KEY (`ID`),
11 KEY `PrincipalID` (`PrincipalID`)
12) ENGINE=MyISAM;
13
14COMMIT;
15
16:VERSION 2 # --------------------------
17
18BEGIN;
19
20INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
21DROP TABLE `diva_im_offline`;
22DELETE FROM `migrations` WHERE name='diva_im_Store';
23
24COMMIT;
25
26:VERSION 3 # --------------------------
27
28BEGIN;
29
30ALTER TABLE `im_offline`
31 ADD `FromID` char(36) NOT NULL default '' AFTER `PrincipalID`,
32 ADD KEY `FromID` (`FromID`);
33
34COMMIT;
35
36:VERSION 4 # --------------------------
37
38BEGIN;
39
40ALTER TABLE im_offline CONVERT TO CHARACTER SET utf8;
41
42COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
index ca2fe11..993a5a0 100644
--- a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
@@ -11,7 +11,7 @@ CREATE TABLE `inventoryfolders` (
11 PRIMARY KEY (`folderID`), 11 PRIMARY KEY (`folderID`),
12 KEY `owner` (`agentID`), 12 KEY `owner` (`agentID`),
13 KEY `parent` (`parentFolderID`) 13 KEY `parent` (`parentFolderID`)
14) ENGINE=MyISAM DEFAULT CHARSET=utf8; 14) ENGINE=InnoDB DEFAULT CHARSET=utf8;
15 15
16CREATE TABLE `inventoryitems` ( 16CREATE TABLE `inventoryitems` (
17 `inventoryID` varchar(36) NOT NULL default '', 17 `inventoryID` varchar(36) NOT NULL default '',
@@ -36,7 +36,7 @@ CREATE TABLE `inventoryitems` (
36 PRIMARY KEY (`inventoryID`), 36 PRIMARY KEY (`inventoryID`),
37 KEY `owner` (`avatarID`), 37 KEY `owner` (`avatarID`),
38 KEY `folder` (`parentFolderID`) 38 KEY `folder` (`parentFolderID`)
39) ENGINE=MyISAM DEFAULT CHARSET=utf8; 39) ENGINE=InnoDB DEFAULT CHARSET=utf8;
40 40
41COMMIT; 41COMMIT;
42 42
diff --git a/OpenSim/Data/MySQL/Resources/LogStore.migrations b/OpenSim/Data/MySQL/Resources/LogStore.migrations
index b572411..9ac26ac 100644
--- a/OpenSim/Data/MySQL/Resources/LogStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/LogStore.migrations
@@ -10,4 +10,4 @@ CREATE TABLE `logs` (
10 `priority` int(11) default NULL, 10 `priority` int(11) default NULL,
11 `message` text, 11 `message` text,
12 PRIMARY KEY (`logID`) 12 PRIMARY KEY (`logID`)
13) ENGINE=MyISAM DEFAULT CHARSET=utf8; 13) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/OpenSim/Data/MySQL/Resources/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations
index 5dc96d2..c4e40fa 100644
--- a/OpenSim/Data/MySQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -1,4 +1,4 @@
1:VERSION 1 # -------------------------- 1:VERSION 1 # --------------------------
2 2
3BEGIN; 3BEGIN;
4 4
@@ -7,7 +7,7 @@ CREATE TABLE `Presence` (
7 `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 7 `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
8 `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 8 `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
9 `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' 9 `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
10) ENGINE=MyISAM; 10) ENGINE=InnoDB;
11 11
12CREATE UNIQUE INDEX SessionID ON Presence(SessionID); 12CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
13CREATE INDEX UserID ON Presence(UserID); 13CREATE INDEX UserID ON Presence(UserID);
@@ -21,3 +21,11 @@ BEGIN;
21ALTER TABLE `Presence` ADD COLUMN LastSeen timestamp; 21ALTER TABLE `Presence` ADD COLUMN LastSeen timestamp;
22 22
23COMMIT; 23COMMIT;
24
25:VERSION 3 # --------------------------
26
27BEGIN;
28
29CREATE INDEX RegionID ON Presence(RegionID);
30
31COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 071f64e..ac31380 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -146,7 +146,7 @@ CREATE TABLE `land` (
146 `UserLookAtZ` float default NULL, 146 `UserLookAtZ` float default NULL,
147 `AuthbuyerID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000', 147 `AuthbuyerID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
148 PRIMARY KEY (`UUID`) 148 PRIMARY KEY (`UUID`)
149) ENGINE=MyISAM DEFAULT CHARSET=utf8; 149) ENGINE=InnoDB DEFAULT CHARSET=utf8;
150 150
151CREATE TABLE `landaccesslist` ( 151CREATE TABLE `landaccesslist` (
152 `LandUUID` varchar(255) default NULL, 152 `LandUUID` varchar(255) default NULL,
@@ -168,7 +168,7 @@ COMMIT;
168:VERSION 3 #--------------------- 168:VERSION 3 #---------------------
169 169
170BEGIN; 170BEGIN;
171 CREATE TABLE regionban (regionUUID VARCHAR(36) NOT NULL, bannedUUID VARCHAR(36) NOT NULL, bannedIp VARCHAR(16) NOT NULL, bannedIpHostMask VARCHAR(16) NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; 171 CREATE TABLE regionban (regionUUID VARCHAR(36) NOT NULL, bannedUUID VARCHAR(36) NOT NULL, bannedIp VARCHAR(16) NOT NULL, bannedIpHostMask VARCHAR(16) NOT NULL) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
172COMMIT; 172COMMIT;
173 173
174:VERSION 4 #--------------------- 174:VERSION 4 #---------------------
@@ -226,13 +226,13 @@ COMMIT;
226 226
227BEGIN; 227BEGIN;
228 228
229alter table landaccesslist ENGINE = MyISAM; 229alter table landaccesslist ENGINE = InnoDB;
230alter table migrations ENGINE = MyISAM; 230alter table migrations ENGINE = InnoDB;
231alter table primitems ENGINE = MyISAM; 231alter table primitems ENGINE = InnoDB;
232alter table prims ENGINE = MyISAM; 232alter table prims ENGINE = InnoDB;
233alter table primshapes ENGINE = MyISAM; 233alter table primshapes ENGINE = InnoDB;
234alter table regionsettings ENGINE = MyISAM; 234alter table regionsettings ENGINE = InnoDB;
235alter table terrain ENGINE = MyISAM; 235alter table terrain ENGINE = InnoDB;
236 236
237COMMIT; 237COMMIT;
238 238
@@ -384,7 +384,7 @@ CREATE TABLE `regionsettings` (
384 `covenant` char(36) default NULL, 384 `covenant` char(36) default NULL,
385 `Sandbox` tinyint(4) NOT NULL, 385 `Sandbox` tinyint(4) NOT NULL,
386 PRIMARY KEY (`regionUUID`) 386 PRIMARY KEY (`regionUUID`)
387) ENGINE=MyISAM; 387) ENGINE=InnoDB;
388 388
389commit; 389commit;
390 390
@@ -852,7 +852,7 @@ CREATE TABLE IF NOT EXISTS `spawn_points` (
852 `Pitch` float NOT NULL, 852 `Pitch` float NOT NULL,
853 `Distance` float NOT NULL, 853 `Distance` float NOT NULL,
854 KEY `RegionID` (`RegionID`) 854 KEY `RegionID` (`RegionID`)
855) ENGINE=MyISAM; 855) ENGINE=Innodb;
856 856
857ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL; 857ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
858COMMIT; 858COMMIT;
@@ -891,7 +891,7 @@ CREATE TABLE `regionenvironment` (
891 `region_id` varchar(36) NOT NULL, 891 `region_id` varchar(36) NOT NULL,
892 `llsd_settings` TEXT NOT NULL, 892 `llsd_settings` TEXT NOT NULL,
893 PRIMARY KEY (`region_id`) 893 PRIMARY KEY (`region_id`)
894) ENGINE=MyISAM DEFAULT CHARSET=utf8; 894) ENGINE=InnoDB DEFAULT CHARSET=utf8;
895 895
896COMMIT; 896COMMIT;
897 897
@@ -902,3 +902,49 @@ BEGIN;
902CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`)); 902CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
903 903
904COMMIT; 904COMMIT;
905
906:VERSION 46 #---------------- Dynamic attributes
907
908BEGIN;
909
910ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
911
912COMMIT;
913
914:VERSION 47 #---------------- Extra physics params
915
916BEGIN;
917
918ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0';
919ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000';
920ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1';
921ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6';
922ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5';
923
924COMMIT;
925
926:VERSION 48 #---------------- Keyframes
927
928BEGIN;
929
930ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
931
932COMMIT;
933
934:VERSION 49 #--------------------- Save attachment info
935
936BEGIN;
937ALTER TABLE prims ADD COLUMN AttachedPosX double default 0;
938ALTER TABLE prims ADD COLUMN AttachedPosY double default 0;
939ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0;
940ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0';
941COMMIT;
942
943:VERSION 50 #---- Change LandFlags to unsigned
944
945BEGIN;
946
947ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null;
948
949COMMIT;
950
diff --git a/OpenSim/Data/MySQL/Resources/UserAccount.migrations b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
index 97e5e4f..84011e6 100644
--- a/OpenSim/Data/MySQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
@@ -10,7 +10,7 @@ CREATE TABLE `UserAccounts` (
10 `Email` VARCHAR(64), 10 `Email` VARCHAR(64),
11 `ServiceURLs` TEXT, 11 `ServiceURLs` TEXT,
12 `Created` INT(11) 12 `Created` INT(11)
13) ENGINE=MyISAM DEFAULT CHARSET=utf8; 13) ENGINE=InnoDB DEFAULT CHARSET=utf8;
14 14
15COMMIT; 15COMMIT;
16 16
diff --git a/sql/osprofile.sql b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index bcd5be0..87e99fa 100644
--- a/sql/osprofile.sql
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -1,3 +1,7 @@
1:VERSION 1 # -------------------------------
2
3begin;
4
1CREATE TABLE IF NOT EXISTS `classifieds` ( 5CREATE TABLE IF NOT EXISTS `classifieds` (
2 `classifieduuid` char(36) NOT NULL, 6 `classifieduuid` char(36) NOT NULL,
3 `creatoruuid` char(36) NOT NULL, 7 `creatoruuid` char(36) NOT NULL,
@@ -15,7 +19,8 @@ CREATE TABLE IF NOT EXISTS `classifieds` (
15 `classifiedflags` int(8) NOT NULL, 19 `classifiedflags` int(8) NOT NULL,
16 `priceforlisting` int(5) NOT NULL, 20 `priceforlisting` int(5) NOT NULL,
17 PRIMARY KEY (`classifieduuid`) 21 PRIMARY KEY (`classifieduuid`)
18) ENGINE=MyISAM DEFAULT CHARSET=latin1; 22) ENGINE=InnoDB DEFAULT CHARSET=latin1;
23
19 24
20CREATE TABLE IF NOT EXISTS `usernotes` ( 25CREATE TABLE IF NOT EXISTS `usernotes` (
21 `useruuid` varchar(36) NOT NULL, 26 `useruuid` varchar(36) NOT NULL,
@@ -24,6 +29,7 @@ CREATE TABLE IF NOT EXISTS `usernotes` (
24 UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`) 29 UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`)
25) ENGINE=MyISAM DEFAULT CHARSET=latin1; 30) ENGINE=MyISAM DEFAULT CHARSET=latin1;
26 31
32
27CREATE TABLE IF NOT EXISTS `userpicks` ( 33CREATE TABLE IF NOT EXISTS `userpicks` (
28 `pickuuid` varchar(36) NOT NULL, 34 `pickuuid` varchar(36) NOT NULL,
29 `creatoruuid` varchar(36) NOT NULL, 35 `creatoruuid` varchar(36) NOT NULL,
@@ -41,6 +47,7 @@ CREATE TABLE IF NOT EXISTS `userpicks` (
41 PRIMARY KEY (`pickuuid`) 47 PRIMARY KEY (`pickuuid`)
42) ENGINE=MyISAM DEFAULT CHARSET=latin1; 48) ENGINE=MyISAM DEFAULT CHARSET=latin1;
43 49
50
44CREATE TABLE IF NOT EXISTS `userprofile` ( 51CREATE TABLE IF NOT EXISTS `userprofile` (
45 `useruuid` varchar(36) NOT NULL, 52 `useruuid` varchar(36) NOT NULL,
46 `profilePartner` varchar(36) NOT NULL, 53 `profilePartner` varchar(36) NOT NULL,
@@ -59,6 +66,23 @@ CREATE TABLE IF NOT EXISTS `userprofile` (
59 PRIMARY KEY (`useruuid`) 66 PRIMARY KEY (`useruuid`)
60) ENGINE=MyISAM DEFAULT CHARSET=latin1; 67) ENGINE=MyISAM DEFAULT CHARSET=latin1;
61 68
69commit;
70
71:VERSION 2 # -------------------------------
72
73begin;
74CREATE TABLE IF NOT EXISTS `userdata` (
75 `UserId` char(36) NOT NULL,
76 `TagId` varchar(64) NOT NULL,
77 `DataKey` varchar(255),
78 `DataVal` varchar(255),
79 PRIMARY KEY (`UserId`,`TagId`)
80) ENGINE=MyISAM DEFAULT CHARSET=latin1;
81
82commit;
83
84:VERSION 3 # -------------------------------
85begin;
62CREATE TABLE IF NOT EXISTS `usersettings` ( 86CREATE TABLE IF NOT EXISTS `usersettings` (
63 `useruuid` varchar(36) NOT NULL, 87 `useruuid` varchar(36) NOT NULL,
64 `imviaemail` enum('true','false') NOT NULL, 88 `imviaemail` enum('true','false') NOT NULL,
@@ -66,3 +90,9 @@ CREATE TABLE IF NOT EXISTS `usersettings` (
66 `email` varchar(254) NOT NULL, 90 `email` varchar(254) NOT NULL,
67 PRIMARY KEY (`useruuid`) 91 PRIMARY KEY (`useruuid`)
68) ENGINE=MyISAM DEFAULT CHARSET=latin1; 92) ENGINE=MyISAM DEFAULT CHARSET=latin1;
93commit;
94
95:VERSION 4 # -------------------------------
96begin;
97ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
98commit;
diff --git a/OpenSim/Data/MySQL/Resources/UserStore.migrations b/OpenSim/Data/MySQL/Resources/UserStore.migrations
index 9129075..f054611 100644
--- a/OpenSim/Data/MySQL/Resources/UserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserStore.migrations
@@ -21,7 +21,7 @@ CREATE TABLE `agents` (
21 PRIMARY KEY (`UUID`), 21 PRIMARY KEY (`UUID`),
22 UNIQUE KEY `session` (`sessionID`), 22 UNIQUE KEY `session` (`sessionID`),
23 UNIQUE KEY `ssession` (`secureSessionID`) 23 UNIQUE KEY `ssession` (`secureSessionID`)
24) ENGINE=MyISAM DEFAULT CHARSET=utf8; 24) ENGINE=InnoDB DEFAULT CHARSET=utf8;
25 25
26-- Create schema avatar_appearance 26-- Create schema avatar_appearance
27-- 27--
@@ -59,7 +59,7 @@ CREATE TABLE `avatarappearance` (
59 Skirt_Item char(36) NOT NULL, 59 Skirt_Item char(36) NOT NULL,
60 Skirt_Asset char(36) NOT NULL, 60 Skirt_Asset char(36) NOT NULL,
61 PRIMARY KEY (`Owner`) 61 PRIMARY KEY (`Owner`)
62) ENGINE=MyISAM DEFAULT CHARSET=utf8; 62) ENGINE=InnoDB DEFAULT CHARSET=utf8;
63 63
64SET FOREIGN_KEY_CHECKS=0; 64SET FOREIGN_KEY_CHECKS=0;
65-- ---------------------------- 65-- ----------------------------
@@ -71,7 +71,7 @@ CREATE TABLE `userfriends` (
71 `friendPerms` INT NOT NULL, 71 `friendPerms` INT NOT NULL,
72 `datetimestamp` INT NOT NULL, 72 `datetimestamp` INT NOT NULL,
73 UNIQUE KEY (`ownerID`, `friendID`) 73 UNIQUE KEY (`ownerID`, `friendID`)
74) ENGINE=MyISAM DEFAULT CHARSET=utf8; 74) ENGINE=InnoDB DEFAULT CHARSET=utf8;
75-- ---------------------------- 75-- ----------------------------
76-- Table structure for users 76-- Table structure for users
77-- ---------------------------- 77-- ----------------------------
@@ -101,7 +101,7 @@ CREATE TABLE `users` (
101 `webLoginKey` varchar(36) default NULL, 101 `webLoginKey` varchar(36) default NULL,
102 PRIMARY KEY (`UUID`), 102 PRIMARY KEY (`UUID`),
103 UNIQUE KEY `usernames` (`username`,`lastname`) 103 UNIQUE KEY `usernames` (`username`,`lastname`)
104) ENGINE=MyISAM DEFAULT CHARSET=utf8; 104) ENGINE=InnoDB DEFAULT CHARSET=utf8;
105 105
106-- ---------------------------- 106-- ----------------------------
107-- Records 107-- Records
@@ -138,7 +138,7 @@ COMMIT;
138 138
139BEGIN; 139BEGIN;
140 140
141CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=MyISAM; 141CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=InnoDB;
142 142
143COMMIT; 143COMMIT;
144 144
diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
index bb58c39..9459e3e 100644
--- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
@@ -3,25 +3,30 @@
3 3
4BEGIN; 4BEGIN;
5 5
6CREATE TABLE `xassetsmeta` ( 6CREATE TABLE `XAssetsMeta` (
7 `id` char(36) NOT NULL, 7 `ID` char(36) NOT NULL,
8 `hash` binary(32) NOT NULL, 8 `Hash` binary(32) NOT NULL,
9 `name` varchar(64) NOT NULL, 9 `Name` varchar(64) NOT NULL,
10 `description` varchar(64) NOT NULL, 10 `Description` varchar(64) NOT NULL,
11 `asset_type` tinyint(4) NOT NULL, 11 `AssetType` tinyint(4) NOT NULL,
12 `local` tinyint(1) NOT NULL, 12 `Local` tinyint(1) NOT NULL,
13 `temporary` tinyint(1) NOT NULL, 13 `Temporary` tinyint(1) NOT NULL,
14 `create_time` int(11) NOT NULL, 14 `CreateTime` int(11) NOT NULL,
15 `access_time` int(11) NOT NULL, 15 `AccessTime` int(11) NOT NULL,
16 `asset_flags` int(11) NOT NULL, 16 `AssetFlags` int(11) NOT NULL,
17 `creator_id` varchar(128) NOT NULL, 17 `CreatorID` varchar(128) NOT NULL,
18 PRIMARY KEY (`id`) 18 PRIMARY KEY (`id`)
19) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1'; 19) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
20 20
21CREATE TABLE `xassetsdata` ( 21CREATE TABLE `XAssetsData` (
22 `hash` binary(32) NOT NULL, 22 `Hash` binary(32) NOT NULL,
23 `data` longblob NOT NULL, 23 `Data` longblob NOT NULL,
24 PRIMARY KEY (`hash`) 24 PRIMARY KEY (`hash`)
25) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1'; 25) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
26 26
27COMMIT; \ No newline at end of file 27COMMIT;
28
29:VERSION 2
30
31BEGIN;
32COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
new file mode 100644
index 0000000..9e6f1c1
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
@@ -0,0 +1,115 @@
1:VERSION 1 # --------------------------
2
3BEGIN;
4
5CREATE TABLE `os_groups_groups` (
6 `GroupID` char(36) NOT NULL default '',
7 `Location` varchar(255) NOT NULL default '',
8 `Name` varchar(255) NOT NULL default '',
9 `Charter` text NOT NULL,
10 `InsigniaID` char(36) NOT NULL default '',
11 `FounderID` char(36) NOT NULL default '',
12 `MembershipFee` int(11) NOT NULL default '0',
13 `OpenEnrollment` varchar(255) NOT NULL default '',
14 `ShowInList` int(4) NOT NULL default '0',
15 `AllowPublish` int(4) NOT NULL default '0',
16 `MaturePublish` int(4) NOT NULL default '0',
17 `OwnerRoleID` char(36) NOT NULL default '',
18 PRIMARY KEY (`GroupID`),
19 UNIQUE KEY `Name` (`Name`),
20 FULLTEXT KEY `Name_2` (`Name`)
21) ENGINE=MyISAM;
22
23
24CREATE TABLE `os_groups_membership` (
25 `GroupID`char(36) NOT NULL default '',
26 `PrincipalID` VARCHAR(255) NOT NULL default '',
27 `SelectedRoleID` char(36) NOT NULL default '',
28 `Contribution` int(11) NOT NULL default '0',
29 `ListInProfile` int(4) NOT NULL default '1',
30 `AcceptNotices` int(4) NOT NULL default '1',
31 `AccessToken` char(36) NOT NULL default '',
32 PRIMARY KEY (`GroupID`,`PrincipalID`),
33 KEY `PrincipalID` (`PrincipalID`)
34) ENGINE=MyISAM;
35
36
37CREATE TABLE `os_groups_roles` (
38 `GroupID` char(36) NOT NULL default '',
39 `RoleID` char(36) NOT NULL default '',
40 `Name` varchar(255) NOT NULL default '',
41 `Description` varchar(255) NOT NULL default '',
42 `Title` varchar(255) NOT NULL default '',
43 `Powers` bigint(20) unsigned NOT NULL default '0',
44 PRIMARY KEY (`GroupID`,`RoleID`),
45 KEY `GroupID` (`GroupID`)
46) ENGINE=MyISAM;
47
48
49CREATE TABLE `os_groups_rolemembership` (
50 `GroupID` char(36) NOT NULL default '',
51 `RoleID` char(36) NOT NULL default '',
52 `PrincipalID` VARCHAR(255) NOT NULL default '',
53 PRIMARY KEY (`GroupID`,`RoleID`,`PrincipalID`),
54 KEY `PrincipalID` (`PrincipalID`)
55) ENGINE=MyISAM;
56
57
58CREATE TABLE `os_groups_invites` (
59 `InviteID` char(36) NOT NULL default '',
60 `GroupID` char(36) NOT NULL default '',
61 `RoleID` char(36) NOT NULL default '',
62 `PrincipalID` VARCHAR(255) NOT NULL default '',
63 `TMStamp` timestamp NOT NULL,
64 PRIMARY KEY (`InviteID`),
65 UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`)
66) ENGINE=MyISAM;
67
68
69CREATE TABLE `os_groups_notices` (
70 `GroupID` char(36) NOT NULL default '',
71 `NoticeID` char(36) NOT NULL default '',
72 `TMStamp` int(10) unsigned NOT NULL default '0',
73 `FromName` varchar(255) NOT NULL default '',
74 `Subject` varchar(255) NOT NULL default '',
75 `Message` text NOT NULL,
76 `HasAttachment` int(4) NOT NULL default '0',
77 `AttachmentType` int(4) NOT NULL default '0',
78 `AttachmentName` varchar(128) NOT NULL default '',
79 `AttachmentItemID` char(36) NOT NULL default '',
80 `AttachmentOwnerID` varchar(255) NOT NULL default '',
81 PRIMARY KEY (`NoticeID`),
82 KEY `GroupID` (`GroupID`),
83 KEY `TMStamp` (`TMStamp`)
84) ENGINE=MyISAM;
85
86CREATE TABLE `os_groups_principals` (
87 `PrincipalID` VARCHAR(255) NOT NULL default '',
88 `ActiveGroupID` char(36) NOT NULL default '',
89 PRIMARY KEY (`PrincipalID`)
90) ENGINE=MyISAM;
91
92COMMIT;
93
94:VERSION 2 # --------------------------
95
96BEGIN;
97
98INSERT INTO `os_groups_groups` SELECT * from `diva_groups_groups`;
99DROP TABLE `diva_groups_groups`;
100INSERT INTO `os_groups_membership` SELECT * from `diva_groups_membership`;
101DROP TABLE `diva_groups_membership`;
102INSERT INTO `os_groups_roles` SELECT * from `diva_groups_roles`;
103DROP TABLE `diva_groups_roles`;
104INSERT INTO `os_groups_rolemembership` SELECT * from `diva_groups_rolemembership`;
105DROP TABLE `diva_groups_rolemembership`;
106INSERT INTO `os_groups_invites` SELECT * from `diva_groups_invites`;
107DROP TABLE `diva_groups_invites`;
108INSERT INTO `os_groups_notices` SELECT * from `diva_groups_notices`;
109DROP TABLE `diva_groups_notices`;
110INSERT INTO `os_groups_principals` SELECT * from `diva_groups_principals`;
111DROP TABLE `diva_groups_principals`;
112
113DELETE FROM `migrations` WHERE name='diva_im_Store';
114
115COMMIT; \ No newline at end of file