Various database fixups.

InnoDB -> MyISAM
utf8
if not exists
white space

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
             if (ver <= 0)   // -1 = no table, 0 = no version record
             {
                 if (ver < 0)
-                    ExecuteScript("create table migrations(name varchar(100), version int)");
+                    ExecuteScript("create table if not exists migrations(name varchar(100), version int) ENGINE=MyISAM DEFAULT CHARSET=utf8");
                 InsertVersion("migrations", 1);
             }
         }
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 @@
 
 BEGIN;
 
-CREATE TABLE `AgentPrefs` (
+CREATE TABLE IF NOT EXISTS `AgentPrefs` (
     `PrincipalID` CHAR(36) NOT NULL,
     `AccessPrefs` CHAR(2) NOT NULL DEFAULT 'M',
     `HoverHeight` DOUBLE(30, 27) NOT NULL DEFAULT 0,
@@ -13,6 +13,6 @@ CREATE TABLE `AgentPrefs` (
     `PermNextOwner` INT(6) NOT NULL DEFAULT 532480,
     UNIQUE KEY `PrincipalID` (`PrincipalID`),
     PRIMARY KEY(`PrincipalID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   `asset_flags` int(11) NOT NULL DEFAULT '0',
   `CreatorID` varchar(128) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   `webLoginKey` varchar(255) NOT NULL DEFAULT '',
   `accountType` varchar(32) NOT NULL DEFAULT 'UserAccount',
   PRIMARY KEY (`UUID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `tokens` (
   `UUID` char(36) NOT NULL,
@@ -19,6 +19,6 @@ CREATE TABLE IF NOT EXISTS `tokens` (
   KEY `UUID` (`UUID`),
   KEY `token` (`token`),
   KEY `validity` (`validity`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   `Value` text,
   PRIMARY KEY (`PrincipalID`,`Name`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `estate_map` (
   `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
   `EstateID` int(11) NOT NULL,
   PRIMARY KEY (`RegionID`),
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `estate_settings` (
   `EstateID` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -50,13 +50,13 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
   `AllowParcelChanges` tinyint(4) NOT NULL DEFAULT '1',
   `AllowSetHome` tinyint(4) NOT NULL DEFAULT '1',
   PRIMARY KEY (`EstateID`)
-) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `estate_users` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `estateban` (
   `EstateID` int(10) unsigned NOT NULL,
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `estateban` (
   `bannedIpHostMask` varchar(16) NOT NULL,
   `bannedNameMask` varchar(64) DEFAULT NULL,
   KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
 
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 @@
 
 BEGIN;
 
-CREATE TABLE `fsassets` (
+CREATE TABLE IF NOT EXISTS `fsassets` (
   `id` char(36) NOT NULL,
   `name` varchar(64) NOT NULL DEFAULT '',
   `description` varchar(64) NOT NULL DEFAULT '',
@@ -13,6 +13,6 @@ CREATE TABLE `fsassets` (
   `access_time` int(11) NOT NULL DEFAULT '0',
   `asset_flags` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-COMMIT;
\ No newline at end of file
+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` (
   `Offered` varchar(32) NOT NULL DEFAULT '0',
   PRIMARY KEY (`PrincipalID`(36),`Friend`(36)),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`),
   KEY `ScopeID` (`ScopeID`),
   KEY `flags` (`flags`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
 
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 @@
 
 BEGIN;
 
-CREATE TABLE `GridUser` (
+CREATE TABLE IF NOT EXISTS `GridUser` (
     `UserID` VARCHAR(255) NOT NULL,
     `HomeRegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
     `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
@@ -14,11 +14,6 @@ CREATE TABLE `GridUser` (
     `Login` CHAR(16) NOT NULL DEFAULT '0',
     `Logout` CHAR(16) NOT NULL DEFAULT '0',
     PRIMARY KEY  (`UserID`)
-) ENGINE=InnoDB;
-
-COMMIT;
-
-:VERSION 2         # -------------------------- 
-BEGIN;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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 @@
 
 BEGIN;
 
-CREATE TABLE `hg_traveling_data` (
-    `SessionID` VARCHAR(36) NOT NULL,
-    `UserID` VARCHAR(36) NOT NULL,
-        `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '',
-        `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '',
-        `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
-        `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
-    `TMStamp` timestamp NOT NULL,
-    PRIMARY KEY  (`SessionID`),
-        KEY (`UserID`)
-) ENGINE=InnoDB;
+CREATE TABLE IF NOT EXISTS `hg_traveling_data` (
+  `SessionID` VARCHAR(36) NOT NULL,
+  `UserID` VARCHAR(36) NOT NULL,
+  `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '',
+  `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '',
+  `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+  `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+  `TMStamp` timestamp NOT NULL,
+  PRIMARY KEY  (`SessionID`),
+  KEY (`UserID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
-
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` (
   PRIMARY KEY (`ID`),
   KEY `PrincipalID` (`PrincipalID`),
   KEY `FromID` (`FromID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   PRIMARY KEY (`inventoryID`),
   KEY `inventoryitems_avatarid` (`avatarID`),
   KEY `inventoryitems_parentFolderid` (`parentFolderID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `inventoryfolders` (
   `folderName` varchar(64) DEFAULT NULL,
@@ -37,6 +37,6 @@ CREATE TABLE IF NOT EXISTS `inventoryfolders` (
   PRIMARY KEY (`folderID`),
   KEY `inventoryfolders_agentid` (`agentID`),
   KEY `inventoryfolders_parentFolderid` (`parentFolderID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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 @@
 
 :VERSION 1
 
-CREATE TABLE `logs` (
+CREATE TABLE IF NOT EXISTS `logs` (
   `logID` int(10) unsigned NOT NULL auto_increment,
   `target` varchar(36) default NULL,
   `server` varchar(64) default NULL,
@@ -10,4 +10,4 @@ CREATE TABLE `logs` (
   `priority` int(11) default NULL,
   `message` text,
   PRIMARY KEY  (`logID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) 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 @@
 
 BEGIN;
 
-CREATE TABLE `MuteList` (
+CREATE TABLE IF NOT EXISTS `MuteList` (
   `AgentID` char(36) NOT NULL,
   `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
   `MuteName` varchar(64) NOT NULL DEFAULT '',
@@ -11,6 +11,6 @@ CREATE TABLE `MuteList` (
   `Stamp` int(11) NOT NULL,
   UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
   KEY `AgentID` (`AgentID`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   UNIQUE KEY `SessionID` (`SessionID`),
   KEY `UserID` (`UserID`),
   KEY `RegionID` (`RegionID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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` (
   PRIMARY KEY (`UUID`),
   KEY `prims_regionuuid` (`RegionUUID`),
   KEY `prims_scenegroupid` (`SceneGroupID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `primshapes` (
   `Shape` int(11) DEFAULT NULL,
@@ -130,7 +130,7 @@ CREATE TABLE IF NOT EXISTS `primshapes` (
   `Media` text,
   `LastAttachPoint` int(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`UUID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `primitems` (
   `invType` int(11) DEFAULT NULL,
@@ -154,13 +154,13 @@ CREATE TABLE IF NOT EXISTS `primitems` (
   `lastOwnerID` char(36) DEFAULT NULL,
   PRIMARY KEY (`itemID`),
   KEY `primitems_primid` (`primID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `terrain` (
   `RegionUUID` varchar(255) DEFAULT NULL,
   `Revision` int(11) DEFAULT NULL,
   `Heightfield` longblob
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `land` (
   `UUID` varchar(255) NOT NULL,
@@ -204,21 +204,21 @@ CREATE TABLE IF NOT EXISTS `land` (
   `ObscureMusic` tinyint(1) NOT NULL DEFAULT '0',
   `ObscureMedia` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`UUID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `landaccesslist` (
   `LandUUID` varchar(255) DEFAULT NULL,
   `AccessUUID` varchar(255) DEFAULT NULL,
   `Flags` int(11) DEFAULT NULL,
   `Expires` int(11) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `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;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `regionsettings` (
   `regionUUID` char(36) NOT NULL,
@@ -265,7 +265,7 @@ CREATE TABLE IF NOT EXISTS `regionsettings` (
   `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
   `covenant_datetime` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`regionUUID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `regionwindlight` (
   `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
@@ -332,7 +332,7 @@ CREATE TABLE IF NOT EXISTS `regionwindlight` (
   `cloud_scroll_y_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `draw_classic_clouds` tinyint(1) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`region_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `spawn_points` (
   `RegionID` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
@@ -340,20 +340,20 @@ CREATE TABLE IF NOT EXISTS `spawn_points` (
   `Pitch` float NOT NULL,
   `Distance` float NOT NULL,
   KEY `RegionID` (`RegionID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `regionenvironment` (
   `region_id` varchar(36) NOT NULL,
   `llsd_settings` text NOT NULL,
   PRIMARY KEY (`region_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `regionextra` (
   `RegionID` char(36) NOT NULL,
   `Name` varchar(32) NOT NULL,
   `value` text,
   PRIMARY KEY (`RegionID`,`Name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
 
@@ -387,7 +387,7 @@ CREATE TABLE IF NOT EXISTS `bakedterrain` (
   `RegionUUID` varchar(255) DEFAULT NULL,
   `Revision` int(11) DEFAULT NULL,
   `Heightfield` longblob
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
 
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` (
   KEY `FirstName` (`FirstName`),
   KEY `LastName` (`LastName`),
   KEY `Name` (`FirstName`,`LastName`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
 
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` (
   `classifiedflags` int(8) NOT NULL,
   `priceforlisting` int(5) NOT NULL,
   PRIMARY KEY (`classifieduuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `usernotes` (
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `usernotes` (
   `targetuuid` varchar(36) NOT NULL,
   `notes` text NOT NULL,
   UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `userpicks` (
@@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `userpicks` (
   `enabled` enum('true','false') NOT NULL,
   `gatekeeper` varchar(255),
   PRIMARY KEY (`pickuuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `userprofile` (
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `userprofile` (
   `profileFirstImage` varchar(36) NOT NULL,
   `profileFirstText` text NOT NULL,
   PRIMARY KEY (`useruuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `userdata` (
     `UserId` char(36) NOT NULL,
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `userdata` (
     `DataKey` varchar(255),
     `DataVal` varchar(255),
     PRIMARY KEY (`UserId`,`TagId`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 CREATE TABLE IF NOT EXISTS `usersettings` (
   `useruuid` varchar(36) NOT NULL,
@@ -81,6 +81,6 @@ CREATE TABLE IF NOT EXISTS `usersettings` (
   `visible` enum('true','false') NOT NULL,
   `email` varchar(254) NOT NULL,
   PRIMARY KEY (`useruuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 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 @@
 
 BEGIN;
 
-CREATE TABLE `XAssetsMeta` (
+CREATE TABLE IF NOT EXISTS `XAssetsMeta` (
   `ID` char(36) NOT NULL,
   `Hash` binary(32) NOT NULL,
   `Name` varchar(64) NOT NULL,
@@ -16,13 +16,13 @@ CREATE TABLE `XAssetsMeta` (
   `AssetFlags` int(11) NOT NULL,
   `CreatorID` varchar(128) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1';
 
-CREATE TABLE `XAssetsData` (
+CREATE TABLE IF NOT EXISTS `XAssetsData` (
   `Hash` binary(32) NOT NULL,
   `Data` longblob NOT NULL,
   PRIMARY KEY (`hash`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1';
 
 COMMIT;
 
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 @@
 
 BEGIN;
 
-CREATE TABLE `XMute` (
+CREATE TABLE IF NOT EXISTS `XMute` (
   `AgentID` char(36) NOT NULL,
   `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
   `MuteName` varchar(64) NOT NULL DEFAULT '',
@@ -11,6 +11,6 @@ CREATE TABLE `XMute` (
   `Stamp` int(11) NOT NULL,
   UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
   KEY `AgentID` (`AgentID`)
-);
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 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 @@
 
 BEGIN;
 
-CREATE TABLE `os_groups_groups` (
+CREATE TABLE IF NOT EXISTS `os_groups_groups` (
   `GroupID` char(36) NOT NULL default '',
   `Location` varchar(255) NOT NULL default '',
   `Name` varchar(255) NOT NULL default '',
@@ -18,10 +18,10 @@ CREATE TABLE `os_groups_groups` (
   PRIMARY KEY  (`GroupID`),
   UNIQUE KEY `Name` (`Name`),
   FULLTEXT KEY `Name_2` (`Name`)
-) ENGINE=MyISAM;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `os_groups_membership` (
+CREATE TABLE IF NOT EXISTS `os_groups_membership` (
   `GroupID`char(36) NOT NULL default '',
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   `SelectedRoleID` char(36) NOT NULL default '',
@@ -31,10 +31,10 @@ CREATE TABLE `os_groups_membership` (
   `AccessToken` char(36) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `os_groups_roles` (
+CREATE TABLE IF NOT EXISTS `os_groups_roles` (
   `GroupID` char(36) NOT NULL default '',
   `RoleID` char(36) NOT NULL default '',
   `Name` varchar(255) NOT NULL default '',
@@ -43,19 +43,19 @@ CREATE TABLE `os_groups_roles` (
   `Powers` bigint(20) unsigned NOT NULL default '0',
   PRIMARY KEY  (`GroupID`,`RoleID`),
   KEY `GroupID` (`GroupID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `os_groups_rolemembership` (
+CREATE TABLE IF NOT EXISTS `os_groups_rolemembership` (
   `GroupID` char(36) NOT NULL default '',
   `RoleID` char(36) NOT NULL default '',
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`RoleID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `os_groups_invites` (
+CREATE TABLE IF NOT EXISTS `os_groups_invites` (
   `InviteID` char(36) NOT NULL default '',
   `GroupID` char(36) NOT NULL default '',
   `RoleID` char(36) NOT NULL default '',
@@ -63,10 +63,10 @@ CREATE TABLE `os_groups_invites` (
   `TMStamp` timestamp NOT NULL,
   PRIMARY KEY  (`InviteID`),
   UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `os_groups_notices` (
+CREATE TABLE IF NOT EXISTS `os_groups_notices` (
   `GroupID` char(36) NOT NULL default '',
   `NoticeID` char(36) NOT NULL default '',
   `TMStamp` int(10) unsigned NOT NULL default '0',
@@ -81,13 +81,13 @@ CREATE TABLE `os_groups_notices` (
   PRIMARY KEY  (`NoticeID`),
   KEY  `GroupID` (`GroupID`),
   KEY `TMStamp` (`TMStamp`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-CREATE TABLE `os_groups_principals` (
+CREATE TABLE IF NOT EXISTS `os_groups_principals` (
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   `ActiveGroupID` char(36) NOT NULL default '',
   PRIMARY KEY  (`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;