aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/Tests
diff options
context:
space:
mode:
authorKitto Flora2010-02-12 14:08:32 -0500
committerKitto Flora2010-02-12 14:08:32 -0500
commit6a70349512a612948918db2f2f485e87b0bc87e6 (patch)
treebdbb11f3ec840c7a14402f0acdc302b04d5a0692 /OpenSim/Data/MySQL/Tests
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentResolve a merge issue (diff)
downloadopensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.zip
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.gz
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.bz2
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLGridTest.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index d1d5c2a..8272316 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -31,6 +31,7 @@ using OpenSim.Data.Tests;
31using log4net; 31using log4net;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Tests.Common; 33using OpenSim.Tests.Common;
34using MySql.Data.MySqlClient;
34 35
35namespace OpenSim.Data.MySQL.Tests 36namespace OpenSim.Data.MySQL.Tests
36{ 37{
@@ -65,9 +66,13 @@ namespace OpenSim.Data.MySQL.Tests
65 66
66 // This actually does the roll forward assembly stuff 67 // This actually does the roll forward assembly stuff
67 Assembly assem = GetType().Assembly; 68 Assembly assem = GetType().Assembly;
68 Migration m = new Migration(database.Connection, assem, "GridStore");
69 69
70 m.Update(); 70 using (MySqlConnection dbcon = new MySqlConnection(connect))
71 {
72 dbcon.Open();
73 Migration m = new Migration(dbcon, assem, "AssetStore");
74 m.Update();
75 }
71 } 76 }
72 77
73 [TestFixtureTearDown] 78 [TestFixtureTearDown]