aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2010-05-19 02:33:23 +0100
committerMelanie2010-05-19 02:33:23 +0100
commit167db502593de5f535d8c322005c63ef263940ed (patch)
treee0a8b273c7f98d047490c4ede6dc6b797fff81db /OpenSim/Data
parentMerge commit 'alex/mssql-estate-bugfix' (diff)
downloadopensim-SC_OLD-167db502593de5f535d8c322005c63ef263940ed.zip
opensim-SC_OLD-167db502593de5f535d8c322005c63ef263940ed.tar.gz
opensim-SC_OLD-167db502593de5f535d8c322005c63ef263940ed.tar.bz2
opensim-SC_OLD-167db502593de5f535d8c322005c63ef263940ed.tar.xz
Allow migration steps to fail again without bringing down the house
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLMigrations.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs
index 959b5d0..a1f7844 100644
--- a/OpenSim/Data/MySQL/MySQLMigrations.cs
+++ b/OpenSim/Data/MySQL/MySQLMigrations.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Data.MySQL
77 { 77 {
78 m_log.ErrorFormat("[MySQL MIGRATION]: Error {0}", args.Exception.Message); 78 m_log.ErrorFormat("[MySQL MIGRATION]: Error {0}", args.Exception.Message);
79 m_log.ErrorFormat("[MySQL MIGRATION]: In SQL: {0}", args.StatementText); 79 m_log.ErrorFormat("[MySQL MIGRATION]: In SQL: {0}", args.StatementText);
80 throw args.Exception; 80 m_log.Error("[MySQL MIGRATION]: The above migration failed to complete. This may cause errors in your install, but could also be normal. Continuing.");
81 }; 81 };
82 scr.Execute(); 82 scr.Execute();
83 } 83 }