diff options
author | onefang | 2019-05-19 21:56:12 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:56:12 +1000 |
commit | d6bcc229eba25ae240322f48ea3f31b832d55ab4 (patch) | |
tree | 7235d35cc1065352e443951fec44c7aadcb4fdfe /OpenSim | |
parent | Dump OpenSim 0.9.0.1 into it's own branch. (diff) | |
download | opensim-SC_OLD-d6bcc229eba25ae240322f48ea3f31b832d55ab4.zip opensim-SC_OLD-d6bcc229eba25ae240322f48ea3f31b832d55ab4.tar.gz opensim-SC_OLD-d6bcc229eba25ae240322f48ea3f31b832d55ab4.tar.bz2 opensim-SC_OLD-d6bcc229eba25ae240322f48ea3f31b832d55ab4.tar.xz |
Various database fixups.
InnoDB -> MyISAM
utf8
if not exists
white space
Diffstat (limited to '')
22 files changed, 79 insertions, 85 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index e54bf55..661f9c1 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
@@ -123,7 +123,7 @@ namespace OpenSim.Data | |||
123 | if (ver <= 0) // -1 = no table, 0 = no version record | 123 | if (ver <= 0) // -1 = no table, 0 = no version record |
124 | { | 124 | { |
125 | if (ver < 0) | 125 | if (ver < 0) |
126 | ExecuteScript("create table migrations(name varchar(100), version int)"); | 126 | ExecuteScript("create table if not exists migrations(name varchar(100), version int) ENGINE=MyISAM DEFAULT CHARSET=utf8"); |
127 | InsertVersion("migrations", 1); | 127 | InsertVersion("migrations", 1); |
128 | } | 128 | } |
129 | } | 129 | } |
diff --git a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations index e496f72..d41ae66 100644 --- a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations +++ b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | BEGIN; | 3 | BEGIN; |
4 | 4 | ||
5 | CREATE TABLE `AgentPrefs` ( | 5 | CREATE TABLE IF NOT EXISTS `AgentPrefs` ( |
6 | `PrincipalID` CHAR(36) NOT NULL, | 6 | `PrincipalID` CHAR(36) NOT NULL, |
7 | `AccessPrefs` CHAR(2) NOT NULL DEFAULT 'M', | 7 | `AccessPrefs` CHAR(2) NOT NULL DEFAULT 'M', |
8 | `HoverHeight` DOUBLE(30, 27) NOT NULL DEFAULT 0, | 8 | `HoverHeight` DOUBLE(30, 27) NOT NULL DEFAULT 0, |
@@ -13,6 +13,6 @@ CREATE TABLE `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=InnoDB DEFAULT CHARSET=utf8; | 16 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
17 | 17 | ||
18 | COMMIT; | 18 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations index 820799d..07f521b 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=InnoDB DEFAULT CHARSET=utf8; | 19 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
20 | 20 | ||
21 | COMMIT; | 21 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/AuthStore.migrations b/OpenSim/Data/MySQL/Resources/AuthStore.migrations index f00979f..8d24fbd 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=InnoDB DEFAULT CHARSET=utf8; | 12 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
13 | 13 | ||
14 | CREATE TABLE IF NOT EXISTS `tokens` ( | 14 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 22 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
23 | 23 | ||
24 | COMMIT; | 24 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/Avatar.migrations b/OpenSim/Data/MySQL/Resources/Avatar.migrations index c5ec9ca..66f75b2 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=InnoDB DEFAULT CHARSET=utf8; | 11 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
12 | 12 | ||
13 | COMMIT; | 13 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations index 615af95..9c1ed83 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=InnoDB DEFAULT CHARSET=utf8; | 9 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
10 | 10 | ||
11 | CREATE TABLE IF NOT EXISTS `estate_managers` ( | 11 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 15 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
16 | 16 | ||
17 | CREATE TABLE IF NOT EXISTS `estate_map` ( | 17 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 22 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
23 | 23 | ||
24 | CREATE TABLE IF NOT EXISTS `estate_settings` ( | 24 | CREATE 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=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8; | 53 | ) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=utf8; |
54 | 54 | ||
55 | CREATE TABLE IF NOT EXISTS `estate_users` ( | 55 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 59 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
60 | 60 | ||
61 | CREATE TABLE IF NOT EXISTS `estateban` ( | 61 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 68 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
69 | 69 | ||
70 | COMMIT; | 70 | COMMIT; |
71 | 71 | ||
diff --git a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations index 87d08c6..3f65d9e 100644 --- a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations +++ b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | BEGIN; | 4 | BEGIN; |
5 | 5 | ||
6 | CREATE TABLE `fsassets` ( | 6 | CREATE TABLE IF NOT EXISTS `fsassets` ( |
7 | `id` char(36) NOT NULL, | 7 | `id` char(36) NOT NULL, |
8 | `name` varchar(64) NOT NULL DEFAULT '', | 8 | `name` varchar(64) NOT NULL DEFAULT '', |
9 | `description` varchar(64) NOT NULL DEFAULT '', | 9 | `description` varchar(64) NOT NULL DEFAULT '', |
@@ -13,6 +13,6 @@ CREATE TABLE `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=InnoDB DEFAULT CHARSET=utf8; | 16 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
17 | 17 | ||
18 | COMMIT; \ No newline at end of file | 18 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations index 6840f07..7dc7607 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=InnoDB DEFAULT CHARSET=utf8; | 12 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
13 | 13 | ||
14 | COMMIT; | 14 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/GridStore.migrations b/OpenSim/Data/MySQL/Resources/GridStore.migrations index e4c8fc3..4116235 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=InnoDB DEFAULT CHARSET=utf8; | 49 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
50 | 50 | ||
51 | COMMIT; | 51 | COMMIT; |
52 | 52 | ||
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations index d08e096..dd73974 100644 --- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations +++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | BEGIN; | 3 | BEGIN; |
4 | 4 | ||
5 | CREATE TABLE `GridUser` ( | 5 | CREATE TABLE IF NOT EXISTS `GridUser` ( |
6 | `UserID` VARCHAR(255) NOT NULL, | 6 | `UserID` VARCHAR(255) NOT NULL, |
7 | `HomeRegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', | 7 | `HomeRegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', |
8 | `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>', | 8 | `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>', |
@@ -14,11 +14,6 @@ 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=InnoDB; | 17 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
18 | |||
19 | COMMIT; | ||
20 | |||
21 | :VERSION 2 # -------------------------- | ||
22 | BEGIN; | ||
23 | 18 | ||
24 | COMMIT; | 19 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations index b4e4422..ed1fede 100644 --- a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations +++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations | |||
@@ -2,17 +2,16 @@ | |||
2 | 2 | ||
3 | BEGIN; | 3 | BEGIN; |
4 | 4 | ||
5 | CREATE TABLE `hg_traveling_data` ( | 5 | CREATE TABLE IF NOT EXISTS `hg_traveling_data` ( |
6 | `SessionID` VARCHAR(36) NOT NULL, | 6 | `SessionID` VARCHAR(36) NOT NULL, |
7 | `UserID` VARCHAR(36) NOT NULL, | 7 | `UserID` VARCHAR(36) NOT NULL, |
8 | `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '', | 8 | `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '', |
9 | `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '', | 9 | `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '', |
10 | `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '', | 10 | `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '', |
11 | `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '', | 11 | `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '', |
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=InnoDB; | 15 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
16 | 16 | ||
17 | COMMIT; | 17 | COMMIT; |
18 | |||
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations index 4f14826..e271fcc 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=InnoDB DEFAULT CHARSET=utf8; | 14 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
15 | 15 | ||
16 | COMMIT; | 16 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations index 2d4384c..7283e41 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=InnoDB DEFAULT CHARSET=utf8; | 28 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
29 | 29 | ||
30 | CREATE TABLE IF NOT EXISTS `inventoryfolders` ( | 30 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 40 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
41 | 41 | ||
42 | COMMIT; | 42 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/LogStore.migrations b/OpenSim/Data/MySQL/Resources/LogStore.migrations index 9ac26ac..f2990cc 100644 --- a/OpenSim/Data/MySQL/Resources/LogStore.migrations +++ b/OpenSim/Data/MySQL/Resources/LogStore.migrations | |||
@@ -1,7 +1,7 @@ | |||
1 |  | 1 |  |
2 | :VERSION 1 | 2 | :VERSION 1 |
3 | 3 | ||
4 | CREATE TABLE `logs` ( | 4 | CREATE TABLE IF NOT EXISTS `logs` ( |
5 | `logID` int(10) unsigned NOT NULL auto_increment, | 5 | `logID` int(10) unsigned NOT NULL auto_increment, |
6 | `target` varchar(36) default NULL, | 6 | `target` varchar(36) default NULL, |
7 | `server` varchar(64) default NULL, | 7 | `server` varchar(64) default NULL, |
@@ -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=InnoDB DEFAULT CHARSET=utf8; | 13 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
diff --git a/OpenSim/Data/MySQL/Resources/MuteListStore.migrations b/OpenSim/Data/MySQL/Resources/MuteListStore.migrations index 5bde63e..164dc51 100644 --- a/OpenSim/Data/MySQL/Resources/MuteListStore.migrations +++ b/OpenSim/Data/MySQL/Resources/MuteListStore.migrations | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | BEGIN; | 3 | BEGIN; |
4 | 4 | ||
5 | CREATE TABLE `MuteList` ( | 5 | CREATE TABLE IF NOT EXISTS `MuteList` ( |
6 | `AgentID` char(36) NOT NULL, | 6 | `AgentID` char(36) NOT NULL, |
7 | `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', | 7 | `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', |
8 | `MuteName` varchar(64) NOT NULL DEFAULT '', | 8 | `MuteName` varchar(64) NOT NULL DEFAULT '', |
@@ -11,6 +11,6 @@ CREATE TABLE `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 | ); | 14 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
15 | 15 | ||
16 | COMMIT; | 16 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations index 50aa756..4d14b9d 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=InnoDB DEFAULT CHARSET=utf8; | 14 | ) ENGINE=MyISAM 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 0577392..fb7862a 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=InnoDB DEFAULT CHARSET=latin1; | 100 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 133 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 157 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 163 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=utf8; | 207 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 214 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=utf8; | 221 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=utf8; | 268 | ) ENGINE=MyISAM 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', |
@@ -332,7 +332,7 @@ 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=InnoDB DEFAULT CHARSET=utf8; | 335 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
336 | 336 | ||
337 | CREATE TABLE IF NOT EXISTS `spawn_points` ( | 337 | CREATE 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 utf8 COLLATE utf8_unicode_ci NOT NULL, |
@@ -340,20 +340,20 @@ CREATE TABLE IF NOT EXISTS `spawn_points` ( | |||
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=InnoDB DEFAULT CHARSET=utf8; | 343 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
344 | 344 | ||
345 | CREATE TABLE IF NOT EXISTS `regionenvironment` ( | 345 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 349 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
350 | 350 | ||
351 | CREATE TABLE IF NOT EXISTS `regionextra` ( | 351 | CREATE 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=InnoDB DEFAULT CHARSET=utf8; | 356 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
357 | 357 | ||
358 | COMMIT; | 358 | COMMIT; |
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=InnoDB DEFAULT CHARSET=utf8; | 390 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
391 | 391 | ||
392 | COMMIT; | 392 | COMMIT; |
393 | 393 | ||
diff --git a/OpenSim/Data/MySQL/Resources/UserAccount.migrations b/OpenSim/Data/MySQL/Resources/UserAccount.migrations index 98be097..dcb375e 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=InnoDB DEFAULT CHARSET=utf8; | 21 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
22 | 22 | ||
23 | COMMIT; | 23 | COMMIT; |
24 | 24 | ||
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations index cfcc18b..512b6ed 100644 --- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations +++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |||
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS `classifieds` ( | |||
19 | `classifiedflags` int(8) NOT NULL, | 19 | `classifiedflags` int(8) NOT NULL, |
20 | `priceforlisting` int(5) NOT NULL, | 20 | `priceforlisting` int(5) NOT NULL, |
21 | PRIMARY KEY (`classifieduuid`) | 21 | PRIMARY KEY (`classifieduuid`) |
22 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1; | 22 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; |
23 | 23 | ||
24 | 24 | ||
25 | CREATE TABLE IF NOT EXISTS `usernotes` ( | 25 | CREATE TABLE IF NOT EXISTS `usernotes` ( |
@@ -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=InnoDB DEFAULT CHARSET=latin1; | 30 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 49 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 68 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 76 | ) ENGINE=MyISAM 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=InnoDB DEFAULT CHARSET=latin1; | 84 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1; |
85 | 85 | ||
86 | commit; | 86 | commit; |
diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations index 9459e3e..7641a97 100644 --- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations +++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | BEGIN; | 4 | BEGIN; |
5 | 5 | ||
6 | CREATE TABLE `XAssetsMeta` ( | 6 | CREATE TABLE IF NOT EXISTS `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, |
@@ -16,13 +16,13 @@ CREATE TABLE `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=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1'; | 19 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1'; |
20 | 20 | ||
21 | CREATE TABLE `XAssetsData` ( | 21 | CREATE 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=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1'; | 25 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1'; |
26 | 26 | ||
27 | COMMIT; | 27 | COMMIT; |
28 | 28 | ||
diff --git a/OpenSim/Data/MySQL/Resources/XMute.migrations b/OpenSim/Data/MySQL/Resources/XMute.migrations index 4ac7f82..084c67b 100644 --- a/OpenSim/Data/MySQL/Resources/XMute.migrations +++ b/OpenSim/Data/MySQL/Resources/XMute.migrations | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | BEGIN; | 3 | BEGIN; |
4 | 4 | ||
5 | CREATE TABLE `XMute` ( | 5 | CREATE TABLE IF NOT EXISTS `XMute` ( |
6 | `AgentID` char(36) NOT NULL, | 6 | `AgentID` char(36) NOT NULL, |
7 | `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', | 7 | `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', |
8 | `MuteName` varchar(64) NOT NULL DEFAULT '', | 8 | `MuteName` varchar(64) NOT NULL DEFAULT '', |
@@ -11,6 +11,6 @@ CREATE TABLE `XMute` ( | |||
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 | ); | 14 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
15 | 15 | ||
16 | COMMIT; | 16 | COMMIT; |
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations index 6ec8914..0b605ab 100644 --- a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations +++ b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | BEGIN; | 3 | BEGIN; |
4 | 4 | ||
5 | CREATE TABLE `os_groups_groups` ( | 5 | CREATE TABLE IF NOT EXISTS `os_groups_groups` ( |
6 | `GroupID` char(36) NOT NULL default '', | 6 | `GroupID` char(36) NOT NULL default '', |
7 | `Location` varchar(255) NOT NULL default '', | 7 | `Location` varchar(255) NOT NULL default '', |
8 | `Name` varchar(255) NOT NULL default '', | 8 | `Name` varchar(255) NOT NULL default '', |
@@ -18,10 +18,10 @@ 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=MyISAM DEFAULT CHARSET=utf8; |
22 | 22 | ||
23 | 23 | ||
24 | CREATE TABLE `os_groups_membership` ( | 24 | CREATE TABLE IF NOT EXISTS `os_groups_membership` ( |
25 | `GroupID`char(36) NOT NULL default '', | 25 | `GroupID`char(36) NOT NULL default '', |
26 | `PrincipalID` VARCHAR(255) NOT NULL default '', | 26 | `PrincipalID` VARCHAR(255) NOT NULL default '', |
27 | `SelectedRoleID` char(36) NOT NULL default '', | 27 | `SelectedRoleID` char(36) NOT NULL default '', |
@@ -31,10 +31,10 @@ 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=InnoDB; | 34 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
35 | 35 | ||
36 | 36 | ||
37 | CREATE TABLE `os_groups_roles` ( | 37 | CREATE TABLE IF NOT EXISTS `os_groups_roles` ( |
38 | `GroupID` char(36) NOT NULL default '', | 38 | `GroupID` char(36) NOT NULL default '', |
39 | `RoleID` char(36) NOT NULL default '', | 39 | `RoleID` char(36) NOT NULL default '', |
40 | `Name` varchar(255) NOT NULL default '', | 40 | `Name` varchar(255) NOT NULL default '', |
@@ -43,19 +43,19 @@ 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=InnoDB; | 46 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
47 | 47 | ||
48 | 48 | ||
49 | CREATE TABLE `os_groups_rolemembership` ( | 49 | CREATE TABLE IF NOT EXISTS `os_groups_rolemembership` ( |
50 | `GroupID` char(36) NOT NULL default '', | 50 | `GroupID` char(36) NOT NULL default '', |
51 | `RoleID` char(36) NOT NULL default '', | 51 | `RoleID` char(36) NOT NULL default '', |
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=InnoDB; | 55 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
56 | 56 | ||
57 | 57 | ||
58 | CREATE TABLE `os_groups_invites` ( | 58 | CREATE TABLE IF NOT EXISTS `os_groups_invites` ( |
59 | `InviteID` char(36) NOT NULL default '', | 59 | `InviteID` char(36) NOT NULL default '', |
60 | `GroupID` char(36) NOT NULL default '', | 60 | `GroupID` char(36) NOT NULL default '', |
61 | `RoleID` char(36) NOT NULL default '', | 61 | `RoleID` char(36) NOT NULL default '', |
@@ -63,10 +63,10 @@ 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=InnoDB; | 66 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
67 | 67 | ||
68 | 68 | ||
69 | CREATE TABLE `os_groups_notices` ( | 69 | CREATE TABLE IF NOT EXISTS `os_groups_notices` ( |
70 | `GroupID` char(36) NOT NULL default '', | 70 | `GroupID` char(36) NOT NULL default '', |
71 | `NoticeID` char(36) NOT NULL default '', | 71 | `NoticeID` char(36) NOT NULL default '', |
72 | `TMStamp` int(10) unsigned NOT NULL default '0', | 72 | `TMStamp` int(10) unsigned NOT NULL default '0', |
@@ -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=InnoDB; | 84 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
85 | 85 | ||
86 | CREATE TABLE `os_groups_principals` ( | 86 | CREATE 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=InnoDB; | 90 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8; |
91 | 91 | ||
92 | COMMIT; | 92 | COMMIT; |
93 | 93 | ||