From 18af255e90b54b7b1d39eb20f4932ba433bc7b55 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 23 Feb 2013 07:20:32 +1000
Subject: MyISAM is much better performing for OpenSim.

---
 OpenSim/Data/MySQL/Resources/AssetStore.migrations |  2 +-
 OpenSim/Data/MySQL/Resources/AuthStore.migrations  |  4 ++--
 .../Data/MySQL/Resources/EstateStore.migrations    | 12 +++++------
 OpenSim/Data/MySQL/Resources/GridStore.migrations  |  2 +-
 .../Data/MySQL/Resources/GridUserStore.migrations  |  2 +-
 .../Data/MySQL/Resources/InventoryStore.migrations |  4 ++--
 OpenSim/Data/MySQL/Resources/LogStore.migrations   |  2 +-
 OpenSim/Data/MySQL/Resources/Presence.migrations   |  2 +-
 .../Data/MySQL/Resources/RegionStore.migrations    | 24 +++++++++++-----------
 .../Data/MySQL/Resources/UserAccount.migrations    |  2 +-
 OpenSim/Data/MySQL/Resources/UserStore.migrations  | 10 ++++-----
 .../Data/MySQL/Resources/XAssetStore.migrations    |  4 ++--
 12 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'OpenSim/Data/MySQL/Resources')

diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
index e0526fe..f7211c2 100644
--- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -13,7 +13,7 @@ CREATE TABLE `assets` (
   `temporary` tinyint(1) NOT NULL,
   `data` longblob NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/AuthStore.migrations b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
index 023c786..9450940 100644
--- a/OpenSim/Data/MySQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
@@ -8,7 +8,7 @@ CREATE TABLE `auth` (
   `passwordSalt` char(32) NOT NULL default '',
   `webLoginKey` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`UUID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 CREATE TABLE `tokens` (
   `UUID` char(36) NOT NULL,
@@ -18,7 +18,7 @@ CREATE TABLE `tokens` (
   KEY `UUID` (`UUID`),
   KEY `token` (`token`),
   KEY `validity` (`validity`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 commit;
 
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index df82a2e..6ef92ee 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -10,19 +10,19 @@ CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 CREATE TABLE IF NOT EXISTS `estate_groups` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 CREATE TABLE IF NOT EXISTS `estate_users` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 CREATE TABLE IF NOT EXISTS `estateban` (
   `EstateID` int(10) unsigned NOT NULL,
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `estateban` (
   `bannedIpHostMask` varchar(16) NOT NULL,
   `bannedNameMask` varchar(64) default NULL,
   KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 CREATE TABLE IF NOT EXISTS `estate_settings` (
   `EstateID` int(10) unsigned NOT NULL auto_increment,
@@ -60,14 +60,14 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
   `DenyMinors` tinyint not null,
   
   PRIMARY KEY  (`EstateID`)
-) ENGINE=InnoDB AUTO_INCREMENT=100;
+) ENGINE=MyISAM AUTO_INCREMENT=100;
 
 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;
+) ENGINE=MyISAM;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/GridStore.migrations b/OpenSim/Data/MySQL/Resources/GridStore.migrations
index 98ba8c5..b010c63 100644
--- a/OpenSim/Data/MySQL/Resources/GridStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridStore.migrations
@@ -31,7 +31,7 @@ CREATE TABLE `regions` (
   KEY `regionName` (`regionName`),
   KEY `regionHandle` (`regionHandle`),
   KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Rev. 3';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Rev. 3';
 
 :VERSION 2
 
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index d08e096..e2be27e 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -14,7 +14,7 @@ CREATE TABLE `GridUser` (
     `Login` CHAR(16) NOT NULL DEFAULT '0',
     `Logout` CHAR(16) NOT NULL DEFAULT '0',
     PRIMARY KEY  (`UserID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
index 993a5a0..ca2fe11 100644
--- a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
@@ -11,7 +11,7 @@ CREATE TABLE `inventoryfolders` (
   PRIMARY KEY  (`folderID`),
   KEY `owner` (`agentID`),
   KEY `parent` (`parentFolderID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE `inventoryitems` (
   `inventoryID` varchar(36) NOT NULL default '',
@@ -36,7 +36,7 @@ CREATE TABLE `inventoryitems` (
   PRIMARY KEY  (`inventoryID`),
   KEY `owner` (`avatarID`),
   KEY `folder` (`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..b572411 100644
--- a/OpenSim/Data/MySQL/Resources/LogStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/LogStore.migrations
@@ -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/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations
index be4030e..5dc96d2 100644
--- a/OpenSim/Data/MySQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -7,7 +7,7 @@ CREATE TABLE `Presence` (
     `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
     `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
     `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
 CREATE INDEX UserID ON Presence(UserID);
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 5b59779..071f64e 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -146,7 +146,7 @@ CREATE TABLE `land` (
   `UserLookAtZ` float default NULL,
   `AuthbuyerID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
   PRIMARY KEY  (`UUID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE `landaccesslist` (
   `LandUUID` varchar(255) default NULL,
@@ -168,7 +168,7 @@ COMMIT;
 :VERSION 3			#---------------------
 
 BEGIN;
-  CREATE TABLE regionban (regionUUID VARCHAR(36) NOT NULL, bannedUUID VARCHAR(36) NOT NULL, bannedIp VARCHAR(16) NOT NULL, bannedIpHostMask VARCHAR(16) NOT NULL) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+  CREATE TABLE regionban (regionUUID VARCHAR(36) NOT NULL, bannedUUID VARCHAR(36) NOT NULL, bannedIp VARCHAR(16) NOT NULL, bannedIpHostMask VARCHAR(16) NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
 COMMIT;
 
 :VERSION 4			#---------------------
@@ -226,13 +226,13 @@ COMMIT;
 
 BEGIN;
 
-alter table landaccesslist ENGINE = InnoDB;
-alter table migrations ENGINE = InnoDB;
-alter table primitems ENGINE = InnoDB;
-alter table prims ENGINE = InnoDB;
-alter table primshapes ENGINE = InnoDB;
-alter table regionsettings ENGINE = InnoDB;
-alter table terrain ENGINE = InnoDB;
+alter table landaccesslist ENGINE = MyISAM;
+alter table migrations ENGINE = MyISAM;
+alter table primitems ENGINE = MyISAM;
+alter table prims ENGINE = MyISAM;
+alter table primshapes ENGINE = MyISAM;
+alter table regionsettings ENGINE = MyISAM;
+alter table terrain ENGINE = MyISAM;
 
 COMMIT;
 
@@ -384,7 +384,7 @@ CREATE TABLE `regionsettings` (
   `covenant` char(36) default NULL,
   `Sandbox` tinyint(4) NOT NULL,
   PRIMARY KEY  (`regionUUID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 commit;
 
@@ -852,7 +852,7 @@ CREATE TABLE IF NOT EXISTS `spawn_points` (
   `Pitch` float NOT NULL,
   `Distance` float NOT NULL,
   KEY `RegionID` (`RegionID`)
-) ENGINE=Innodb;
+) ENGINE=MyISAM;
 
 ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
 COMMIT;
@@ -891,7 +891,7 @@ CREATE TABLE `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;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/UserAccount.migrations b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
index 84011e6..97e5e4f 100644
--- a/OpenSim/Data/MySQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
@@ -10,7 +10,7 @@ CREATE TABLE `UserAccounts` (
     `Email` VARCHAR(64),
     `ServiceURLs` TEXT,
     `Created` INT(11)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/UserStore.migrations b/OpenSim/Data/MySQL/Resources/UserStore.migrations
index f054611..9129075 100644
--- a/OpenSim/Data/MySQL/Resources/UserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserStore.migrations
@@ -21,7 +21,7 @@ CREATE TABLE `agents` (
   PRIMARY KEY  (`UUID`),
   UNIQUE KEY `session` (`sessionID`),
   UNIQUE KEY `ssession` (`secureSessionID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- Create schema avatar_appearance
 --
@@ -59,7 +59,7 @@ CREATE TABLE `avatarappearance` (
   Skirt_Item char(36) NOT NULL,
   Skirt_Asset char(36) NOT NULL,
   PRIMARY KEY  (`Owner`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
@@ -71,7 +71,7 @@ CREATE TABLE `userfriends` (
    `friendPerms` INT NOT NULL,
    `datetimestamp` INT NOT NULL,
 	 UNIQUE KEY  (`ownerID`, `friendID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- ----------------------------
 -- Table structure for users
 -- ----------------------------
@@ -101,7 +101,7 @@ CREATE TABLE `users` (
   `webLoginKey` varchar(36) default NULL,
   PRIMARY KEY  (`UUID`),
   UNIQUE KEY `usernames` (`username`,`lastname`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records 
@@ -138,7 +138,7 @@ COMMIT;
 
 BEGIN;
 
-CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=InnoDB;
+CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=MyISAM;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
index d3cca5e..bb58c39 100644
--- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
@@ -16,12 +16,12 @@ CREATE TABLE `xassetsmeta` (
   `asset_flags` int(11) NOT NULL,
   `creator_id` 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` (
   `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;
\ No newline at end of file
-- 
cgit v1.1