diff options
author | Justin Clark-Casey (justincc) | 2010-04-23 19:05:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-23 19:05:32 +0100 |
commit | 5ee77886acde5292a7a527866539e7e05d63e344 (patch) | |
tree | 157df3af3bd0175bc73493688c9742312c4d7176 /OpenSim/Data | |
parent | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-5ee77886acde5292a7a527866539e7e05d63e344.zip opensim-SC-5ee77886acde5292a7a527866539e7e05d63e344.tar.gz opensim-SC-5ee77886acde5292a7a527866539e7e05d63e344.tar.bz2 opensim-SC-5ee77886acde5292a7a527866539e7e05d63e344.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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) |