aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLLogData.cs
diff options
context:
space:
mode:
authorMelanie2010-02-08 15:53:20 +0000
committerMelanie2010-02-08 15:53:38 +0000
commitbaaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch)
tree1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /OpenSim/Data/MySQL/MySQLLogData.cs
parentAdded missing configs to Standalone.ini (diff)
parentAdding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff)
downloadopensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip
opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz
opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2
opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken. Please check!
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLLogData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLLogData.cs16
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index 8f67eeb..304883c 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -79,14 +79,19 @@ namespace OpenSim.Data.MySQL
79 79
80 // This actually does the roll forward assembly stuff 80 // This actually does the roll forward assembly stuff
81 Assembly assem = GetType().Assembly; 81 Assembly assem = GetType().Assembly;
82 Migration m = new Migration(database.Connection, assem, "LogStore");
83 82
84 // TODO: After rev 6000, remove this. People should have 83 using (MySql.Data.MySqlClient.MySqlConnection dbcon = new MySql.Data.MySqlClient.MySqlConnection(connect))
85 // been rolled onto the new migration code by then. 84 {
86 TestTables(m); 85 dbcon.Open();
86
87 Migration m = new Migration(dbcon, assem, "LogStore");
87 88
88 m.Update(); 89 // TODO: After rev 6000, remove this. People should have
90 // been rolled onto the new migration code by then.
91 TestTables(m);
89 92
93 m.Update();
94 }
90 } 95 }
91 96
92 /// <summary></summary> 97 /// <summary></summary>
@@ -128,7 +133,6 @@ namespace OpenSim.Data.MySQL
128 } 133 }
129 catch 134 catch
130 { 135 {
131 database.Reconnect();
132 } 136 }
133 } 137 }
134 138