aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAlexRa2010-05-23 11:36:40 +0300
committerAlexRa2010-05-23 11:48:28 +0300
commit05d9ca1b26baaae3e9ab106665163f5beeecd11d (patch)
tree1bcd8a15a63d2e8ef799ff63ecd0f2698b2b1197 /OpenSim
parentMSSQL Migration: CreatorID in InventoryItems changed to VARCHAR(36) (diff)
downloadopensim-SC_OLD-05d9ca1b26baaae3e9ab106665163f5beeecd11d.zip
opensim-SC_OLD-05d9ca1b26baaae3e9ab106665163f5beeecd11d.tar.gz
opensim-SC_OLD-05d9ca1b26baaae3e9ab106665163f5beeecd11d.tar.bz2
opensim-SC_OLD-05d9ca1b26baaae3e9ab106665163f5beeecd11d.tar.xz
MySQL Migrations: Minor correcton to Region/Estate split
(some Estate SQL left behind in the Region migration)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/Resources/EstateStore.migrations12
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations6
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 @@
1:VERSION 13 1:VERSION 13
2 2
3# The estate migrations used to be in Region store 3# The estate migrations used to be in Region store
4# here they will do nothing (bad) if the tables are already there,
5# just update the store version.
6
7BEGIN;
4 8
5CREATE TABLE IF NOT EXISTS `estate_managers` ( 9CREATE TABLE IF NOT EXISTS `estate_managers` (
6 `EstateID` int(10) unsigned NOT NULL, 10 `EstateID` int(10) unsigned NOT NULL,
@@ -65,5 +69,13 @@ CREATE TABLE IF NOT EXISTS `estate_map` (
65 KEY `EstateID` (`EstateID`) 69 KEY `EstateID` (`EstateID`)
66) ENGINE=InnoDB; 70) ENGINE=InnoDB;
67 71
72COMMIT;
73
74:VERSION 32 #--------------------- (moved from RegionStore migr, just in case)
75
76BEGIN;
77ALTER TABLE estate_settings AUTO_INCREMENT = 100;
78COMMIT;
79
68 80
69 81
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
717 717
718COMMIT; 718COMMIT;
719 719
720:VERSION 32 #---------------------
721
722BEGIN;
723ALTER TABLE estate_settings AUTO_INCREMENT = 100;
724COMMIT;
725
726:VERSION 33 #--------------------- 720:VERSION 33 #---------------------
727 721
728BEGIN; 722BEGIN;