diff options
author | UbitUmarov | 2017-01-05 16:33:01 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-05 16:33:01 +0000 |
commit | 9d28fd41c67bd14dd684c6982ff49db8476ef887 (patch) | |
tree | be886a33e381da4e07796d9eb5b19f40ba665ac4 /OpenSim/Data | |
parent | Merge branch 'master' into httptests (diff) | |
parent | a few changes to estates and estate teleportHome (used kick) (diff) | |
download | opensim-SC-9d28fd41c67bd14dd684c6982ff49db8476ef887.zip opensim-SC-9d28fd41c67bd14dd684c6982ff49db8476ef887.tar.gz opensim-SC-9d28fd41c67bd14dd684c6982ff49db8476ef887.tar.bz2 opensim-SC-9d28fd41c67bd14dd684c6982ff49db8476ef887.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to '')
4 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations index e271fcc..4f14826 100644 --- a/OpenSim/Data/MySQL/Resources/IM_Store.migrations +++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations | |||
@@ -11,6 +11,6 @@ CREATE TABLE IF NOT EXISTS `im_offline` ( | |||
11 | PRIMARY KEY (`ID`), | 11 | PRIMARY KEY (`ID`), |
12 | KEY `PrincipalID` (`PrincipalID`), | 12 | KEY `PrincipalID` (`PrincipalID`), |
13 | KEY `FromID` (`FromID`) | 13 | KEY `FromID` (`FromID`) |
14 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; | 14 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
15 | 15 | ||
16 | COMMIT; | 16 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 2108c76..c63cc95 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS `prims` ( | |||
97 | PRIMARY KEY (`UUID`), | 97 | PRIMARY KEY (`UUID`), |
98 | KEY `prims_regionuuid` (`RegionUUID`), | 98 | KEY `prims_regionuuid` (`RegionUUID`), |
99 | KEY `prims_scenegroupid` (`SceneGroupID`) | 99 | KEY `prims_scenegroupid` (`SceneGroupID`) |
100 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 100 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
101 | 101 | ||
102 | CREATE TABLE IF NOT EXISTS `primshapes` ( | 102 | CREATE TABLE IF NOT EXISTS `primshapes` ( |
103 | `Shape` int(11) DEFAULT NULL, | 103 | `Shape` int(11) DEFAULT NULL, |
@@ -130,7 +130,7 @@ CREATE TABLE IF NOT EXISTS `primshapes` ( | |||
130 | `Media` text, | 130 | `Media` text, |
131 | `LastAttachPoint` int(4) NOT NULL DEFAULT '0', | 131 | `LastAttachPoint` int(4) NOT NULL DEFAULT '0', |
132 | PRIMARY KEY (`UUID`) | 132 | PRIMARY KEY (`UUID`) |
133 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 133 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
134 | 134 | ||
135 | CREATE TABLE IF NOT EXISTS `primitems` ( | 135 | CREATE TABLE IF NOT EXISTS `primitems` ( |
136 | `invType` int(11) DEFAULT NULL, | 136 | `invType` int(11) DEFAULT NULL, |
@@ -154,13 +154,13 @@ CREATE TABLE IF NOT EXISTS `primitems` ( | |||
154 | `lastOwnerID` char(36) DEFAULT NULL, | 154 | `lastOwnerID` char(36) DEFAULT NULL, |
155 | PRIMARY KEY (`itemID`), | 155 | PRIMARY KEY (`itemID`), |
156 | KEY `primitems_primid` (`primID`) | 156 | KEY `primitems_primid` (`primID`) |
157 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 157 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
158 | 158 | ||
159 | CREATE TABLE IF NOT EXISTS `terrain` ( | 159 | CREATE TABLE IF NOT EXISTS `terrain` ( |
160 | `RegionUUID` varchar(255) DEFAULT NULL, | 160 | `RegionUUID` varchar(255) DEFAULT NULL, |
161 | `Revision` int(11) DEFAULT NULL, | 161 | `Revision` int(11) DEFAULT NULL, |
162 | `Heightfield` longblob | 162 | `Heightfield` longblob |
163 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 163 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
164 | 164 | ||
165 | CREATE TABLE IF NOT EXISTS `land` ( | 165 | CREATE TABLE IF NOT EXISTS `land` ( |
166 | `UUID` varchar(255) NOT NULL, | 166 | `UUID` varchar(255) NOT NULL, |
@@ -204,21 +204,21 @@ CREATE TABLE IF NOT EXISTS `land` ( | |||
204 | `ObscureMusic` tinyint(1) NOT NULL DEFAULT '0', | 204 | `ObscureMusic` tinyint(1) NOT NULL DEFAULT '0', |
205 | `ObscureMedia` tinyint(1) NOT NULL DEFAULT '0', | 205 | `ObscureMedia` tinyint(1) NOT NULL DEFAULT '0', |
206 | PRIMARY KEY (`UUID`) | 206 | PRIMARY KEY (`UUID`) |
207 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; | 207 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
208 | 208 | ||
209 | CREATE TABLE IF NOT EXISTS `landaccesslist` ( | 209 | CREATE TABLE IF NOT EXISTS `landaccesslist` ( |
210 | `LandUUID` varchar(255) DEFAULT NULL, | 210 | `LandUUID` varchar(255) DEFAULT NULL, |
211 | `AccessUUID` varchar(255) DEFAULT NULL, | 211 | `AccessUUID` varchar(255) DEFAULT NULL, |
212 | `Flags` int(11) DEFAULT NULL, | 212 | `Flags` int(11) DEFAULT NULL, |
213 | `Expires` int(11) NOT NULL DEFAULT '0' | 213 | `Expires` int(11) NOT NULL DEFAULT '0' |
214 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 214 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
215 | 215 | ||
216 | CREATE TABLE IF NOT EXISTS `regionban` ( | 216 | CREATE TABLE IF NOT EXISTS `regionban` ( |
217 | `regionUUID` varchar(36) NOT NULL, | 217 | `regionUUID` varchar(36) NOT NULL, |
218 | `bannedUUID` varchar(36) NOT NULL, | 218 | `bannedUUID` varchar(36) NOT NULL, |
219 | `bannedIp` varchar(16) NOT NULL, | 219 | `bannedIp` varchar(16) NOT NULL, |
220 | `bannedIpHostMask` varchar(16) NOT NULL | 220 | `bannedIpHostMask` varchar(16) NOT NULL |
221 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; | 221 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
222 | 222 | ||
223 | CREATE TABLE IF NOT EXISTS `regionsettings` ( | 223 | CREATE TABLE IF NOT EXISTS `regionsettings` ( |
224 | `regionUUID` char(36) NOT NULL, | 224 | `regionUUID` char(36) NOT NULL, |
@@ -265,7 +265,7 @@ CREATE TABLE IF NOT EXISTS `regionsettings` ( | |||
265 | `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', | 265 | `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', |
266 | `covenant_datetime` int(10) unsigned NOT NULL DEFAULT '0', | 266 | `covenant_datetime` int(10) unsigned NOT NULL DEFAULT '0', |
267 | PRIMARY KEY (`regionUUID`) | 267 | PRIMARY KEY (`regionUUID`) |
268 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; | 268 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
269 | 269 | ||
270 | CREATE TABLE IF NOT EXISTS `regionwindlight` ( | 270 | CREATE TABLE IF NOT EXISTS `regionwindlight` ( |
271 | `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000', | 271 | `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000', |
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations index 008e455..cfcc18b 100644 --- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations +++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |||
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `usernotes` ( | |||
27 | `targetuuid` varchar(36) NOT NULL, | 27 | `targetuuid` varchar(36) NOT NULL, |
28 | `notes` text NOT NULL, | 28 | `notes` text NOT NULL, |
29 | UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`) | 29 | UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`) |
30 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 30 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
31 | 31 | ||
32 | 32 | ||
33 | CREATE TABLE IF NOT EXISTS `userpicks` ( | 33 | CREATE TABLE IF NOT EXISTS `userpicks` ( |
@@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `userpicks` ( | |||
46 | `enabled` enum('true','false') NOT NULL, | 46 | `enabled` enum('true','false') NOT NULL, |
47 | `gatekeeper` varchar(255), | 47 | `gatekeeper` varchar(255), |
48 | PRIMARY KEY (`pickuuid`) | 48 | PRIMARY KEY (`pickuuid`) |
49 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 49 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
50 | 50 | ||
51 | 51 | ||
52 | CREATE TABLE IF NOT EXISTS `userprofile` ( | 52 | CREATE TABLE IF NOT EXISTS `userprofile` ( |
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `userprofile` ( | |||
65 | `profileFirstImage` varchar(36) NOT NULL, | 65 | `profileFirstImage` varchar(36) NOT NULL, |
66 | `profileFirstText` text NOT NULL, | 66 | `profileFirstText` text NOT NULL, |
67 | PRIMARY KEY (`useruuid`) | 67 | PRIMARY KEY (`useruuid`) |
68 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 68 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
69 | 69 | ||
70 | CREATE TABLE IF NOT EXISTS `userdata` ( | 70 | CREATE TABLE IF NOT EXISTS `userdata` ( |
71 | `UserId` char(36) NOT NULL, | 71 | `UserId` char(36) NOT NULL, |
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `userdata` ( | |||
73 | `DataKey` varchar(255), | 73 | `DataKey` varchar(255), |
74 | `DataVal` varchar(255), | 74 | `DataVal` varchar(255), |
75 | PRIMARY KEY (`UserId`,`TagId`) | 75 | PRIMARY KEY (`UserId`,`TagId`) |
76 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 76 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
77 | 77 | ||
78 | CREATE TABLE IF NOT EXISTS `usersettings` ( | 78 | CREATE TABLE IF NOT EXISTS `usersettings` ( |
79 | `useruuid` varchar(36) NOT NULL, | 79 | `useruuid` varchar(36) NOT NULL, |
@@ -81,6 +81,6 @@ CREATE TABLE IF NOT EXISTS `usersettings` ( | |||
81 | `visible` enum('true','false') NOT NULL, | 81 | `visible` enum('true','false') NOT NULL, |
82 | `email` varchar(254) NOT NULL, | 82 | `email` varchar(254) NOT NULL, |
83 | PRIMARY KEY (`useruuid`) | 83 | PRIMARY KEY (`useruuid`) |
84 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | 84 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; |
85 | 85 | ||
86 | commit; | 86 | commit; |
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations index 9e6f1c1..1a49900 100644 --- a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations +++ b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations | |||
@@ -18,7 +18,7 @@ CREATE TABLE `os_groups_groups` ( | |||
18 | PRIMARY KEY (`GroupID`), | 18 | PRIMARY KEY (`GroupID`), |
19 | UNIQUE KEY `Name` (`Name`), | 19 | UNIQUE KEY `Name` (`Name`), |
20 | FULLTEXT KEY `Name_2` (`Name`) | 20 | FULLTEXT KEY `Name_2` (`Name`) |
21 | ) ENGINE=MyISAM; | 21 | ) ENGINE=InnoDB; |
22 | 22 | ||
23 | 23 | ||
24 | CREATE TABLE `os_groups_membership` ( | 24 | CREATE TABLE `os_groups_membership` ( |
@@ -31,7 +31,7 @@ CREATE TABLE `os_groups_membership` ( | |||
31 | `AccessToken` char(36) NOT NULL default '', | 31 | `AccessToken` char(36) NOT NULL default '', |
32 | PRIMARY KEY (`GroupID`,`PrincipalID`), | 32 | PRIMARY KEY (`GroupID`,`PrincipalID`), |
33 | KEY `PrincipalID` (`PrincipalID`) | 33 | KEY `PrincipalID` (`PrincipalID`) |
34 | ) ENGINE=MyISAM; | 34 | ) ENGINE=InnoDB; |
35 | 35 | ||
36 | 36 | ||
37 | CREATE TABLE `os_groups_roles` ( | 37 | CREATE TABLE `os_groups_roles` ( |
@@ -43,7 +43,7 @@ CREATE TABLE `os_groups_roles` ( | |||
43 | `Powers` bigint(20) unsigned NOT NULL default '0', | 43 | `Powers` bigint(20) unsigned NOT NULL default '0', |
44 | PRIMARY KEY (`GroupID`,`RoleID`), | 44 | PRIMARY KEY (`GroupID`,`RoleID`), |
45 | KEY `GroupID` (`GroupID`) | 45 | KEY `GroupID` (`GroupID`) |
46 | ) ENGINE=MyISAM; | 46 | ) ENGINE=InnoDB; |
47 | 47 | ||
48 | 48 | ||
49 | CREATE TABLE `os_groups_rolemembership` ( | 49 | CREATE TABLE `os_groups_rolemembership` ( |
@@ -52,7 +52,7 @@ CREATE TABLE `os_groups_rolemembership` ( | |||
52 | `PrincipalID` VARCHAR(255) NOT NULL default '', | 52 | `PrincipalID` VARCHAR(255) NOT NULL default '', |
53 | PRIMARY KEY (`GroupID`,`RoleID`,`PrincipalID`), | 53 | PRIMARY KEY (`GroupID`,`RoleID`,`PrincipalID`), |
54 | KEY `PrincipalID` (`PrincipalID`) | 54 | KEY `PrincipalID` (`PrincipalID`) |
55 | ) ENGINE=MyISAM; | 55 | ) ENGINE=InnoDB; |
56 | 56 | ||
57 | 57 | ||
58 | CREATE TABLE `os_groups_invites` ( | 58 | CREATE TABLE `os_groups_invites` ( |
@@ -63,7 +63,7 @@ CREATE TABLE `os_groups_invites` ( | |||
63 | `TMStamp` timestamp NOT NULL, | 63 | `TMStamp` timestamp NOT NULL, |
64 | PRIMARY KEY (`InviteID`), | 64 | PRIMARY KEY (`InviteID`), |
65 | UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`) | 65 | UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`) |
66 | ) ENGINE=MyISAM; | 66 | ) ENGINE=InnoDB; |
67 | 67 | ||
68 | 68 | ||
69 | CREATE TABLE `os_groups_notices` ( | 69 | CREATE TABLE `os_groups_notices` ( |
@@ -81,13 +81,13 @@ CREATE TABLE `os_groups_notices` ( | |||
81 | PRIMARY KEY (`NoticeID`), | 81 | PRIMARY KEY (`NoticeID`), |
82 | KEY `GroupID` (`GroupID`), | 82 | KEY `GroupID` (`GroupID`), |
83 | KEY `TMStamp` (`TMStamp`) | 83 | KEY `TMStamp` (`TMStamp`) |
84 | ) ENGINE=MyISAM; | 84 | ) ENGINE=InnoDB; |
85 | 85 | ||
86 | CREATE TABLE `os_groups_principals` ( | 86 | CREATE TABLE `os_groups_principals` ( |
87 | `PrincipalID` VARCHAR(255) NOT NULL default '', | 87 | `PrincipalID` VARCHAR(255) NOT NULL default '', |
88 | `ActiveGroupID` char(36) NOT NULL default '', | 88 | `ActiveGroupID` char(36) NOT NULL default '', |
89 | PRIMARY KEY (`PrincipalID`) | 89 | PRIMARY KEY (`PrincipalID`) |
90 | ) ENGINE=MyISAM; | 90 | ) ENGINE=InnoDB; |
91 | 91 | ||
92 | COMMIT; | 92 | COMMIT; |
93 | 93 | ||
@@ -112,4 +112,4 @@ DROP TABLE `diva_groups_principals`; | |||
112 | 112 | ||
113 | DELETE FROM `migrations` WHERE name='diva_im_Store'; | 113 | DELETE FROM `migrations` WHERE name='diva_im_Store'; |
114 | 114 | ||
115 | COMMIT; \ No newline at end of file | 115 | COMMIT; |