1 files changed, 32 insertions, 48 deletions

diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index 9dfb77b..615af95 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -1,41 +1,29 @@
-:VERSION 13
-
-# The estate migrations used to be in Region store
-# here they will do nothing (bad) if the tables are already there, 
-# just update the store version.
+:VERSION 34
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `estate_managers` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
-
 CREATE TABLE IF NOT EXISTS `estate_groups` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `estate_users` (
+CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `estateban` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `bannedUUID` varchar(36) NOT NULL,
-  `bannedIp` varchar(16) NOT NULL,
-  `bannedIpHostMask` varchar(16) NOT NULL,
-  `bannedNameMask` varchar(64) default NULL,
-  KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+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;
 
 CREATE TABLE IF NOT EXISTS `estate_settings` (
-  `EstateID` int(10) unsigned NOT NULL auto_increment,
-  `EstateName` varchar(64) default NULL,
+  `EstateID` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `EstateName` varchar(64) DEFAULT NULL,
   `AbuseEmailToEstateOwner` tinyint(4) NOT NULL,
   `DenyAnonymous` tinyint(4) NOT NULL,
   `ResetHomeOnTeleport` tinyint(4) NOT NULL,
@@ -55,33 +43,29 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
   `EstateSkipScripts` tinyint(4) NOT NULL,
   `BillableFactor` float NOT NULL,
   `PublicAccess` tinyint(4) NOT NULL,
-  `AbuseEmail` varchar(255) not null,
-  `EstateOwner` varchar(36) not null,
-  `DenyMinors` tinyint not null,
-  
-  PRIMARY KEY  (`EstateID`)
-) ENGINE=MyISAM AUTO_INCREMENT=100;
+  `AbuseEmail` varchar(255) NOT NULL,
+  `EstateOwner` varchar(36) NOT NULL,
+  `DenyMinors` tinyint(4) NOT NULL,
+  `AllowLandmark` tinyint(4) NOT NULL DEFAULT '1',
+  `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;
 
-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`),
+CREATE TABLE IF NOT EXISTS `estate_users` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-COMMIT;
-
-:VERSION 32                     #--------------------- (moved from RegionStore migr, just in case)
-
-BEGIN;
-ALTER TABLE estate_settings AUTO_INCREMENT = 100;
-COMMIT;
-
-:VERSION 33                     #--------------------- 
+CREATE TABLE IF NOT EXISTS `estateban` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `bannedUUID` varchar(36) NOT NULL,
+  `bannedIp` varchar(16) NOT NULL,
+  `bannedIpHostMask` varchar(16) NOT NULL,
+  `bannedNameMask` varchar(64) DEFAULT NULL,
+  KEY `estateban_EstateID` (`EstateID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-BEGIN;
-ALTER TABLE estate_settings ADD COLUMN `AllowLandmark` tinyint(4) NOT NULL default '1';
-ALTER TABLE estate_settings ADD COLUMN `AllowParcelChanges` tinyint(4) NOT NULL default '1';
-ALTER TABLE estate_settings ADD COLUMN `AllowSetHome` tinyint(4) NOT NULL default '1';
 COMMIT;