aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-04-22 17:45:03 +0100
committerMelanie2010-04-22 17:45:03 +0100
commitebcc9874d4d285ab2b45d62cc4fe89e9830111b7 (patch)
tree56ac084b287d73e243d615acae8c777eb8e47c66
parentSanitized parsing of floats (x, y, z location) for Culture. (diff)
downloadopensim-SC_OLD-ebcc9874d4d285ab2b45d62cc4fe89e9830111b7.zip
opensim-SC_OLD-ebcc9874d4d285ab2b45d62cc4fe89e9830111b7.tar.gz
opensim-SC_OLD-ebcc9874d4d285ab2b45d62cc4fe89e9830111b7.tar.bz2
opensim-SC_OLD-ebcc9874d4d285ab2b45d62cc4fe89e9830111b7.tar.xz
Insert a ROLLBACK command on migration step failure. This ensures that
updating the Migrations table will not occur in a partial transaction, which would be auto-rolled-back later.
-rw-r--r--OpenSim/Data/Migration.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 4622e23..68e25ef 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -146,6 +146,8 @@ namespace OpenSim.Data
146 { 146 {
147 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText); 147 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
148 m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message); 148 m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
149 cmd.CommandText = "ROLLBACK;";
150 cmd.ExecuteNonQuery();
149 } 151 }
150 152
151 if (version == 0) 153 if (version == 0)