aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL
diff options
context:
space:
mode:
authorCharles Krinke2008-09-28 22:07:05 +0000
committerCharles Krinke2008-09-28 22:07:05 +0000
commit5ddba2a3a780bdfd02a7a99e00edd87d191b16d3 (patch)
tree3a0c2f6c6c27adf14ba13b549384bb600c4c30b2 /OpenSim/Data/MSSQL
parentMantis#296. Thank you kindly, Idb for a patch that resolves: (diff)
downloadopensim-SC_OLD-5ddba2a3a780bdfd02a7a99e00edd87d191b16d3.zip
opensim-SC_OLD-5ddba2a3a780bdfd02a7a99e00edd87d191b16d3.tar.gz
opensim-SC_OLD-5ddba2a3a780bdfd02a7a99e00edd87d191b16d3.tar.bz2
opensim-SC_OLD-5ddba2a3a780bdfd02a7a99e00edd87d191b16d3.tar.xz
Mantis#2291. Thank you kindly, StrawberryFride for a patch that solves:
User server won't start up for a MSSQL grid migrating from a significantly older version to current version due to duplication in three of the migrations code files. Patch included takes out the duplicated code from the three files so a smooth update should happen on start up.
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r--OpenSim/Data/MSSQL/Resources/002_UserStore.sql9
-rw-r--r--OpenSim/Data/MSSQL/Resources/003_UserStore.sql15
-rw-r--r--OpenSim/Data/MSSQL/Resources/004_UserStore.sql29
3 files changed, 0 insertions, 53 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/002_UserStore.sql b/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
index a3b5868..402eddf 100644
--- a/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
@@ -7,12 +7,3 @@ ALTER TABLE users ADD customType varchar(32) not null default '';
7ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000'; 7ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
8 8
9COMMIT 9COMMIT
10BEGIN TRANSACTION
11
12ALTER TABLE users ADD homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
13ALTER TABLE users ADD userFlags int NOT NULL default 0;
14ALTER TABLE users ADD godLevel int NOT NULL default 0;
15ALTER TABLE users ADD customType varchar(32) not null default '';
16ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
17
18COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/003_UserStore.sql b/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
index c2821e6..cb507c9 100644
--- a/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
@@ -13,18 +13,3 @@ CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
13 13
14 14
15COMMIT 15COMMIT
16BEGIN TRANSACTION
17
18CREATE TABLE [avatarattachments] (
19 [UUID] varchar(36) NOT NULL
20 , [attachpoint] int NOT NULL
21 , [item] varchar(36) NOT NULL
22 , [asset] varchar(36) NOT NULL)
23
24CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
25 (
26 UUID
27 ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
28
29
30COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_UserStore.sql b/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
index f3e223e..08f1a1d 100644
--- a/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
@@ -27,32 +27,3 @@ CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
27 ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] 27 ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
28 28
29COMMIT 29COMMIT
30BEGIN TRANSACTION
31
32CREATE TABLE Tmp_userfriends
33 (
34 ownerID varchar(36) NOT NULL,
35 friendID varchar(36) NOT NULL,
36 friendPerms int NOT NULL,
37 datetimestamp int NOT NULL
38 ) ON [PRIMARY]
39
40IF EXISTS(SELECT * FROM dbo.userfriends)
41 EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
42 SELECT CONVERT(varchar(36), ownerID), CONVERT(varchar(36), friendID), CONVERT(int, friendPerms), CONVERT(int, datetimestamp) FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
43
44DROP TABLE dbo.userfriends
45
46EXECUTE sp_rename N'Tmp_userfriends', N'userfriends', 'OBJECT'
47
48CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON userfriends
49 (
50 ownerID
51 ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
52
53CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
54 (
55 friendID
56 ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
57
58COMMIT