From 05d9ca1b26baaae3e9ab106665163f5beeecd11d Mon Sep 17 00:00:00 2001
From: AlexRa
Date: Sun, 23 May 2010 11:36:40 +0300
Subject: MySQL Migrations: Minor correcton to Region/Estate split

(some Estate SQL left behind in the Region migration)
---
 OpenSim/Data/MySQL/Resources/EstateStore.migrations | 12 ++++++++++++
 OpenSim/Data/MySQL/Resources/RegionStore.migrations |  6 ------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index 2e0d658..df82a2e 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -1,6 +1,10 @@
 :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.
+
+BEGIN;
 
 CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
@@ -65,5 +69,13 @@ CREATE TABLE IF NOT EXISTS `estate_map` (
   KEY `EstateID` (`EstateID`)
 ) ENGINE=InnoDB;
 
+COMMIT;
+
+:VERSION 32			#--------------------- (moved from RegionStore migr, just in case)
+
+BEGIN;
+ALTER TABLE estate_settings AUTO_INCREMENT = 100;
+COMMIT;
+
 
 
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 383c328..d8a279d 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -717,12 +717,6 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT
 
 COMMIT;
 
-:VERSION 32			#---------------------
-
-BEGIN;
-ALTER TABLE estate_settings AUTO_INCREMENT = 100;
-COMMIT;
-
 :VERSION 33			#---------------------
 
 BEGIN;
-- 
cgit v1.1