aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/PGSQL
diff options
context:
space:
mode:
authorBlueWall2015-03-04 19:40:31 -0500
committerBlueWall2015-03-04 19:40:31 -0500
commit7adeb43a885e5093a2edfc26742a0d739491b6ad (patch)
tree9a5dce5ebd1237376de1fe76fb5d1b12d74aba78 /OpenSim/Data/PGSQL
parentMerge branch 'master' of /team/src/opensim (diff)
parentAlter the migrations so that it is a no-op as the columns are unused and the ... (diff)
downloadopensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.zip
opensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.tar.gz
opensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.tar.bz2
opensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.tar.xz
Merge branch 'master' of /team/src/opensim
Diffstat (limited to 'OpenSim/Data/PGSQL')
-rw-r--r--OpenSim/Data/PGSQL/Resources/AssetStore.migrations3
-rw-r--r--OpenSim/Data/PGSQL/Resources/XAssetStore.migrations3
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
index fb7d156..7a858b4 100644
--- a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
@@ -95,4 +95,5 @@ alter table assets add "creatorid" varchar(36) not null default '';
95 95
96:VERSION 8 96:VERSION 8
97 97
98ALTER TABLE assets ALTER COLUMN description TYPE varchar(128); 98BEGIN TRANSACTION;
99COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
index 0e22091..df9d821 100644
--- a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
@@ -77,7 +77,4 @@ COMMIT;
77:VERSION 5 77:VERSION 5
78 78
79BEGIN; 79BEGIN;
80
81ALTER TABLE xassetsmeta ALTER COLUMN description TYPE varchar(128);
82
83COMMIT; 80COMMIT;