diff options
| author | John Hurliman | 2010-04-22 18:56:06 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-22 18:56:06 -0700 |
| commit | 8692ac53f56c8db9942021709e7415b2b2add0c6 (patch) | |
| tree | 5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Data/Migration.cs | |
| parent | * Better error logging for failed SimianGrid web service calls (diff) | |
| parent | Insert a ROLLBACK command on migration step failure. This ensures that (diff) | |
| download | opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.zip opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2 opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Migration.cs')
| -rw-r--r-- | OpenSim/Data/Migration.cs | 2 |
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) |