aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2021-08-17 21:19:52 +1000
committeronefang2021-08-17 21:19:52 +1000
commit804312a2308484cb8eb779a9aa08c0ea8ef8bd52 (patch)
treead4becf32ada15bab31cbd6d9e1f0e801b38edcc
parentNext bit of the inventory backup, actually do the backup. (diff)
downloadopensim-SC-804312a2308484cb8eb779a9aa08c0ea8ef8bd52.zip
opensim-SC-804312a2308484cb8eb779a9aa08c0ea8ef8bd52.tar.gz
opensim-SC-804312a2308484cb8eb779a9aa08c0ea8ef8bd52.tar.bz2
opensim-SC-804312a2308484cb8eb779a9aa08c0ea8ef8bd52.tar.xz
MySQL default character set to utfmb4.
Coz on one box they defaulted to utfmb3, which .NET doesn't support.
-rw-r--r--OpenSim/Data/MySQL/Resources/AgentPrefs.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/AssetStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/AuthStore.migrations4
-rw-r--r--OpenSim/Data/MySQL/Resources/Avatar.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/EstateStore.migrations12
-rw-r--r--OpenSim/Data/MySQL/Resources/FSAssetStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/FriendsStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/GridStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/GridUserStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/HGTravelStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/IM_Store.migrations2
-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/MuteListStore.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/Presence.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations18
-rw-r--r--OpenSim/Data/MySQL/Resources/UserAccount.migrations2
-rw-r--r--OpenSim/Data/MySQL/Resources/XAssetStore.migrations4
-rw-r--r--OpenSim/Data/MySQL/Resources/os_groups_Store.migrations14
19 files changed, 41 insertions, 41 deletions
diff --git a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
index d41ae66..6d864aa 100644
--- a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
+++ b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
@@ -13,6 +13,6 @@ CREATE TABLE IF NOT EXISTS `AgentPrefs` (
13 `PermNextOwner` INT(6) NOT NULL DEFAULT 532480, 13 `PermNextOwner` INT(6) NOT NULL DEFAULT 532480,
14 UNIQUE KEY `PrincipalID` (`PrincipalID`), 14 UNIQUE KEY `PrincipalID` (`PrincipalID`),
15 PRIMARY KEY(`PrincipalID`) 15 PRIMARY KEY(`PrincipalID`)
16) ENGINE=MyISAM DEFAULT CHARSET=utf8; 16) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
17 17
18COMMIT; 18COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
index 07f521b..dc0b084 100644
--- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -16,6 +16,6 @@ CREATE TABLE IF NOT EXISTS `assets` (
16 `asset_flags` int(11) NOT NULL DEFAULT '0', 16 `asset_flags` int(11) NOT NULL DEFAULT '0',
17 `CreatorID` varchar(128) NOT NULL DEFAULT '', 17 `CreatorID` varchar(128) NOT NULL DEFAULT '',
18 PRIMARY KEY (`id`) 18 PRIMARY KEY (`id`)
19) ENGINE=MyISAM DEFAULT CHARSET=utf8; 19) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
20 20
21COMMIT; 21COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AuthStore.migrations b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
index 8d24fbd..ee2fe17 100644
--- a/OpenSim/Data/MySQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `auth` (
9 `webLoginKey` varchar(255) NOT NULL DEFAULT '', 9 `webLoginKey` varchar(255) NOT NULL DEFAULT '',
10 `accountType` varchar(32) NOT NULL DEFAULT 'UserAccount', 10 `accountType` varchar(32) NOT NULL DEFAULT 'UserAccount',
11 PRIMARY KEY (`UUID`) 11 PRIMARY KEY (`UUID`)
12) ENGINE=MyISAM DEFAULT CHARSET=utf8; 12) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
13 13
14CREATE TABLE IF NOT EXISTS `tokens` ( 14CREATE TABLE IF NOT EXISTS `tokens` (
15 `UUID` char(36) NOT NULL, 15 `UUID` char(36) NOT NULL,
@@ -19,6 +19,6 @@ CREATE TABLE IF NOT EXISTS `tokens` (
19 KEY `UUID` (`UUID`), 19 KEY `UUID` (`UUID`),
20 KEY `token` (`token`), 20 KEY `token` (`token`),
21 KEY `validity` (`validity`) 21 KEY `validity` (`validity`)
22) ENGINE=MyISAM DEFAULT CHARSET=utf8; 22) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
23 23
24COMMIT; 24COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/Avatar.migrations b/OpenSim/Data/MySQL/Resources/Avatar.migrations
index 66f75b2..9e11f41 100644
--- a/OpenSim/Data/MySQL/Resources/Avatar.migrations
+++ b/OpenSim/Data/MySQL/Resources/Avatar.migrations
@@ -8,6 +8,6 @@ CREATE TABLE IF NOT EXISTS `Avatars` (
8 `Value` text, 8 `Value` text,
9 PRIMARY KEY (`PrincipalID`,`Name`), 9 PRIMARY KEY (`PrincipalID`,`Name`),
10 KEY `PrincipalID` (`PrincipalID`) 10 KEY `PrincipalID` (`PrincipalID`)
11) ENGINE=MyISAM DEFAULT CHARSET=utf8; 11) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
12 12
13COMMIT; 13COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index 99816ca..87adcca 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -6,20 +6,20 @@ CREATE TABLE IF NOT EXISTS `estate_groups` (
6 `EstateID` int(10) unsigned NOT NULL, 6 `EstateID` int(10) unsigned NOT NULL,
7 `uuid` char(36) NOT NULL, 7 `uuid` char(36) NOT NULL,
8 KEY `EstateID` (`EstateID`) 8 KEY `EstateID` (`EstateID`)
9) ENGINE=MyISAM DEFAULT CHARSET=utf8; 9) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
10 10
11CREATE TABLE IF NOT EXISTS `estate_managers` ( 11CREATE TABLE IF NOT EXISTS `estate_managers` (
12 `EstateID` int(10) unsigned NOT NULL, 12 `EstateID` int(10) unsigned NOT NULL,
13 `uuid` char(36) NOT NULL, 13 `uuid` char(36) NOT NULL,
14 KEY `EstateID` (`EstateID`) 14 KEY `EstateID` (`EstateID`)
15) ENGINE=MyISAM DEFAULT CHARSET=utf8; 15) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
16 16
17CREATE TABLE IF NOT EXISTS `estate_map` ( 17CREATE TABLE IF NOT EXISTS `estate_map` (
18 `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 18 `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
19 `EstateID` int(11) NOT NULL, 19 `EstateID` int(11) NOT NULL,
20 PRIMARY KEY (`RegionID`), 20 PRIMARY KEY (`RegionID`),
21 KEY `EstateID` (`EstateID`) 21 KEY `EstateID` (`EstateID`)
22) ENGINE=MyISAM DEFAULT CHARSET=utf8; 22) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
23 23
24CREATE TABLE IF NOT EXISTS `estate_settings` ( 24CREATE TABLE IF NOT EXISTS `estate_settings` (
25 `EstateID` int(10) unsigned NOT NULL AUTO_INCREMENT, 25 `EstateID` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -50,13 +50,13 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
50 `AllowParcelChanges` tinyint(4) NOT NULL DEFAULT '1', 50 `AllowParcelChanges` tinyint(4) NOT NULL DEFAULT '1',
51 `AllowSetHome` tinyint(4) NOT NULL DEFAULT '1', 51 `AllowSetHome` tinyint(4) NOT NULL DEFAULT '1',
52 PRIMARY KEY (`EstateID`) 52 PRIMARY KEY (`EstateID`)
53) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=utf8; 53) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=utf8mb4;
54 54
55CREATE TABLE IF NOT EXISTS `estate_users` ( 55CREATE TABLE IF NOT EXISTS `estate_users` (
56 `EstateID` int(10) unsigned NOT NULL, 56 `EstateID` int(10) unsigned NOT NULL,
57 `uuid` char(36) NOT NULL, 57 `uuid` char(36) NOT NULL,
58 KEY `EstateID` (`EstateID`) 58 KEY `EstateID` (`EstateID`)
59) ENGINE=MyISAM DEFAULT CHARSET=utf8; 59) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
60 60
61CREATE TABLE IF NOT EXISTS `estateban` ( 61CREATE TABLE IF NOT EXISTS `estateban` (
62 `EstateID` int(10) unsigned NOT NULL, 62 `EstateID` int(10) unsigned NOT NULL,
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `estateban` (
65 `bannedIpHostMask` varchar(16) NOT NULL, 65 `bannedIpHostMask` varchar(16) NOT NULL,
66 `bannedNameMask` varchar(64) DEFAULT NULL, 66 `bannedNameMask` varchar(64) DEFAULT NULL,
67 KEY `estateban_EstateID` (`EstateID`) 67 KEY `estateban_EstateID` (`EstateID`)
68) ENGINE=MyISAM DEFAULT CHARSET=utf8; 68) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
69 69
70COMMIT; 70COMMIT;
71 71
diff --git a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
index 3f65d9e..c8f5f66 100644
--- a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
@@ -13,6 +13,6 @@ CREATE TABLE IF NOT EXISTS `fsassets` (
13 `access_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', 14 `asset_flags` int(11) NOT NULL DEFAULT '0',
15 PRIMARY KEY (`id`) 15 PRIMARY KEY (`id`)
16) ENGINE=MyISAM DEFAULT CHARSET=utf8; 16) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
17 17
18COMMIT; 18COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 7dc7607..ccb1291 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -9,6 +9,6 @@ CREATE TABLE IF NOT EXISTS `Friends` (
9 `Offered` varchar(32) NOT NULL DEFAULT '0', 9 `Offered` varchar(32) NOT NULL DEFAULT '0',
10 PRIMARY KEY (`PrincipalID`(36),`Friend`(36)), 10 PRIMARY KEY (`PrincipalID`(36),`Friend`(36)),
11 KEY `PrincipalID` (`PrincipalID`) 11 KEY `PrincipalID` (`PrincipalID`)
12) ENGINE=MyISAM DEFAULT CHARSET=utf8; 12) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
13 13
14COMMIT; 14COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/GridStore.migrations b/OpenSim/Data/MySQL/Resources/GridStore.migrations
index 4116235..d2775c1 100644
--- a/OpenSim/Data/MySQL/Resources/GridStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridStore.migrations
@@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `regions` (
46 KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`), 46 KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`),
47 KEY `ScopeID` (`ScopeID`), 47 KEY `ScopeID` (`ScopeID`),
48 KEY `flags` (`flags`) 48 KEY `flags` (`flags`)
49) ENGINE=MyISAM DEFAULT CHARSET=utf8; 49) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
50 50
51COMMIT; 51COMMIT;
52 52
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index 99b16ed..0cb7d07 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 17) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
18 18
19COMMIT; 19COMMIT;
20 20
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
index 04f90b0..0766733 100644
--- a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `hg_traveling_data` (
12 `TMStamp` timestamp NOT NULL, 12 `TMStamp` timestamp NOT NULL,
13 PRIMARY KEY (`SessionID`), 13 PRIMARY KEY (`SessionID`),
14 KEY (`UserID`) 14 KEY (`UserID`)
15) ENGINE=MyISAM DEFAULT CHARSET=utf8; 15) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
16 16
17COMMIT; 17COMMIT;
18 18
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
index e271fcc..8394bd9 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=MyISAM DEFAULT CHARSET=utf8mb4;
15 15
16COMMIT; 16COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
index 7283e41..808cdc9 100644
--- a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
@@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `inventoryitems` (
25 PRIMARY KEY (`inventoryID`), 25 PRIMARY KEY (`inventoryID`),
26 KEY `inventoryitems_avatarid` (`avatarID`), 26 KEY `inventoryitems_avatarid` (`avatarID`),
27 KEY `inventoryitems_parentFolderid` (`parentFolderID`) 27 KEY `inventoryitems_parentFolderid` (`parentFolderID`)
28) ENGINE=MyISAM DEFAULT CHARSET=utf8; 28) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
29 29
30CREATE TABLE IF NOT EXISTS `inventoryfolders` ( 30CREATE TABLE IF NOT EXISTS `inventoryfolders` (
31 `folderName` varchar(64) DEFAULT NULL, 31 `folderName` varchar(64) DEFAULT NULL,
@@ -37,6 +37,6 @@ CREATE TABLE IF NOT EXISTS `inventoryfolders` (
37 PRIMARY KEY (`folderID`), 37 PRIMARY KEY (`folderID`),
38 KEY `inventoryfolders_agentid` (`agentID`), 38 KEY `inventoryfolders_agentid` (`agentID`),
39 KEY `inventoryfolders_parentFolderid` (`parentFolderID`) 39 KEY `inventoryfolders_parentFolderid` (`parentFolderID`)
40) ENGINE=MyISAM DEFAULT CHARSET=utf8; 40) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
41 41
42COMMIT; 42COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/LogStore.migrations b/OpenSim/Data/MySQL/Resources/LogStore.migrations
index f2990cc..45959d0 100644
--- a/OpenSim/Data/MySQL/Resources/LogStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/LogStore.migrations
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `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=MyISAM DEFAULT CHARSET=utf8mb4;
diff --git a/OpenSim/Data/MySQL/Resources/MuteListStore.migrations b/OpenSim/Data/MySQL/Resources/MuteListStore.migrations
index 164dc51..a84537e 100644
--- a/OpenSim/Data/MySQL/Resources/MuteListStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/MuteListStore.migrations
@@ -11,6 +11,6 @@ CREATE TABLE IF NOT EXISTS `MuteList` (
11 `Stamp` int(11) NOT NULL, 11 `Stamp` int(11) NOT NULL,
12 UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`), 12 UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
13 KEY `AgentID` (`AgentID`) 13 KEY `AgentID` (`AgentID`)
14) ENGINE=MyISAM DEFAULT CHARSET=utf8; 14) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
15 15
16COMMIT; 16COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations
index 4d14b9d..50437af 100644
--- a/OpenSim/Data/MySQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -11,6 +11,6 @@ CREATE TABLE IF NOT EXISTS `Presence` (
11 UNIQUE KEY `SessionID` (`SessionID`), 11 UNIQUE KEY `SessionID` (`SessionID`),
12 KEY `UserID` (`UserID`), 12 KEY `UserID` (`UserID`),
13 KEY `RegionID` (`RegionID`) 13 KEY `RegionID` (`RegionID`)
14) ENGINE=MyISAM DEFAULT CHARSET=utf8; 14) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
15 15
16COMMIT; 16COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index a974503..014d227 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -204,7 +204,7 @@ 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=MyISAM DEFAULT CHARSET=utf8mb4;
208 208
209CREATE TABLE IF NOT EXISTS `landaccesslist` ( 209CREATE TABLE IF NOT EXISTS `landaccesslist` (
210 `LandUUID` varchar(255) DEFAULT NULL, 210 `LandUUID` varchar(255) DEFAULT NULL,
@@ -218,7 +218,7 @@ CREATE TABLE IF NOT EXISTS `regionban` (
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=MyISAM DEFAULT CHARSET=utf8mb4;
222 222
223CREATE TABLE IF NOT EXISTS `regionsettings` ( 223CREATE 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=MyISAM DEFAULT CHARSET=utf8mb4;
269 269
270CREATE TABLE IF NOT EXISTS `regionwindlight` ( 270CREATE 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',
@@ -332,28 +332,28 @@ CREATE TABLE IF NOT EXISTS `regionwindlight` (
332 `cloud_scroll_y_lock` tinyint(1) unsigned NOT NULL DEFAULT '0', 332 `cloud_scroll_y_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
333 `draw_classic_clouds` tinyint(1) unsigned NOT NULL DEFAULT '1', 333 `draw_classic_clouds` tinyint(1) unsigned NOT NULL DEFAULT '1',
334 PRIMARY KEY (`region_id`) 334 PRIMARY KEY (`region_id`)
335) ENGINE=MyISAM DEFAULT CHARSET=utf8; 335) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
336 336
337CREATE TABLE IF NOT EXISTS `spawn_points` ( 337CREATE TABLE IF NOT EXISTS `spawn_points` (
338 `RegionID` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, 338 `RegionID` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8_unicode_ci NOT NULL,
339 `Yaw` float NOT NULL, 339 `Yaw` float NOT NULL,
340 `Pitch` float NOT NULL, 340 `Pitch` float NOT NULL,
341 `Distance` float NOT NULL, 341 `Distance` float NOT NULL,
342 KEY `RegionID` (`RegionID`) 342 KEY `RegionID` (`RegionID`)
343) ENGINE=MyISAM DEFAULT CHARSET=utf8; 343) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
344 344
345CREATE TABLE IF NOT EXISTS `regionenvironment` ( 345CREATE TABLE IF NOT EXISTS `regionenvironment` (
346 `region_id` varchar(36) NOT NULL, 346 `region_id` varchar(36) NOT NULL,
347 `llsd_settings` text NOT NULL, 347 `llsd_settings` text NOT NULL,
348 PRIMARY KEY (`region_id`) 348 PRIMARY KEY (`region_id`)
349) ENGINE=MyISAM DEFAULT CHARSET=utf8; 349) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
350 350
351CREATE TABLE IF NOT EXISTS `regionextra` ( 351CREATE TABLE IF NOT EXISTS `regionextra` (
352 `RegionID` char(36) NOT NULL, 352 `RegionID` char(36) NOT NULL,
353 `Name` varchar(32) NOT NULL, 353 `Name` varchar(32) NOT NULL,
354 `value` text, 354 `value` text,
355 PRIMARY KEY (`RegionID`,`Name`) 355 PRIMARY KEY (`RegionID`,`Name`)
356) ENGINE=MyISAM DEFAULT CHARSET=utf8; 356) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
357 357
358COMMIT; 358COMMIT;
359 359
@@ -387,7 +387,7 @@ CREATE TABLE IF NOT EXISTS `bakedterrain` (
387 `RegionUUID` varchar(255) DEFAULT NULL, 387 `RegionUUID` varchar(255) DEFAULT NULL,
388 `Revision` int(11) DEFAULT NULL, 388 `Revision` int(11) DEFAULT NULL,
389 `Heightfield` longblob 389 `Heightfield` longblob
390) ENGINE=MyISAM DEFAULT CHARSET=utf8; 390) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
391 391
392COMMIT; 392COMMIT;
393 393
diff --git a/OpenSim/Data/MySQL/Resources/UserAccount.migrations b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
index dcb375e..9679562 100644
--- a/OpenSim/Data/MySQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `UserAccounts` (
18 KEY `FirstName` (`FirstName`), 18 KEY `FirstName` (`FirstName`),
19 KEY `LastName` (`LastName`), 19 KEY `LastName` (`LastName`),
20 KEY `Name` (`FirstName`,`LastName`) 20 KEY `Name` (`FirstName`,`LastName`)
21) ENGINE=MyISAM DEFAULT CHARSET=utf8; 21) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
22 22
23COMMIT; 23COMMIT;
24 24
diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
index 7641a97..42ebd96 100644
--- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
@@ -16,13 +16,13 @@ CREATE TABLE IF NOT EXISTS `XAssetsMeta` (
16 `AssetFlags` int(11) NOT NULL, 16 `AssetFlags` int(11) NOT NULL,
17 `CreatorID` 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=MyISAM DEFAULT CHARSET=utf8mb4 COMMENT='Version 1';
20 20
21CREATE TABLE IF NOT EXISTS `XAssetsData` ( 21CREATE TABLE IF NOT EXISTS `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=MyISAM DEFAULT CHARSET=utf8mb4 COMMENT='Version 1';
26 26
27COMMIT; 27COMMIT;
28 28
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
index 444915b..e95b768 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 IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 21) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
22 22
23 23
24CREATE TABLE IF NOT EXISTS `os_groups_membership` ( 24CREATE TABLE IF NOT EXISTS `os_groups_membership` (
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 34) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
35 35
36 36
37CREATE TABLE IF NOT EXISTS `os_groups_roles` ( 37CREATE TABLE IF NOT EXISTS `os_groups_roles` (
@@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 46) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
47 47
48 48
49CREATE TABLE IF NOT EXISTS `os_groups_rolemembership` ( 49CREATE TABLE IF NOT EXISTS `os_groups_rolemembership` (
@@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 55) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
56 56
57 57
58CREATE TABLE IF NOT EXISTS `os_groups_invites` ( 58CREATE TABLE IF NOT EXISTS `os_groups_invites` (
@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 66) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
67 67
68 68
69CREATE TABLE IF NOT EXISTS `os_groups_notices` ( 69CREATE TABLE IF NOT EXISTS `os_groups_notices` (
@@ -81,13 +81,13 @@ CREATE TABLE IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 84) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
85 85
86CREATE TABLE IF NOT EXISTS `os_groups_principals` ( 86CREATE TABLE IF NOT EXISTS `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 DEFAULT CHARSET=utf8; 90) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
91 91
92COMMIT; 92COMMIT;
93 93