1 files changed, 29 insertions, 11 deletions

diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
index 5820a90..34791cf 100644
--- a/OpenSim/Data/MySQL/MySQLFramework.cs
+++ b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -45,27 +45,45 @@ namespace OpenSim.Data.MySQL
                 System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         protected string m_connectionString;
+        protected object m_dbLock = new object();
 
         protected MySqlFramework(string connectionString)
         {
             m_connectionString = connectionString;
         }
 
+        //////////////////////////////////////////////////////////////
+        //
+        // All non queries are funneled through one connection
+        // to increase performance a little
+        //
         protected int ExecuteNonQuery(MySqlCommand cmd)
         {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            lock (m_dbLock)
             {
-                dbcon.Open();
-                cmd.Connection = dbcon;
-
-                try
-                {
-                    return cmd.ExecuteNonQuery();
-                }
-                catch (Exception e)
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
-                    m_log.Error(e.Message, e);
-                    return 0;
+                    try
+                    {
+                        dbcon.Open();
+                        cmd.Connection = dbcon;
+
+                        try
+                        {
+                            return cmd.ExecuteNonQuery();
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error(e.Message, e);
+                            m_log.Error(Environment.StackTrace.ToString());
+                            return 0;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(e.Message, e);
+                        return 0;
+                    }
                 }
             }
         }