Merge branch 'master' into presence-refactor

This was a large, heavily conflicted merge and things MAY have got broken.
Please check!

1 files changed, 37 insertions, 34 deletions

diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index e508b52..5056aee 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -38,16 +38,22 @@ namespace OpenSim.Data.MySQL
     public class MySqlAuthenticationData : MySqlFramework, IAuthenticationData
     {
         private string m_Realm;
-        private List<string> m_ColumnNames = null;
-        private int m_LastExpire = 0;
+        private List<string> m_ColumnNames;
+        private int m_LastExpire;
+        // private string m_connectionString;
 
         public MySqlAuthenticationData(string connectionString, string realm)
                 : base(connectionString)
         {
             m_Realm = realm;
+            m_connectionString = connectionString;
 
-            Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore");
-            m.Update();
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+                Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore");
+                m.Update();
+            }
         }
 
         public AuthenticationData Get(UUID principalID)
@@ -55,45 +61,42 @@ namespace OpenSim.Data.MySQL
             AuthenticationData ret = new AuthenticationData();
             ret.Data = new Dictionary<string, object>();
 
-            MySqlCommand cmd = new MySqlCommand(
-                "select * from `"+m_Realm+"` where UUID = ?principalID"
-            );
-
-            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-
-            IDataReader result = ExecuteReader(cmd);
-
-            if (result.Read())
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                ret.PrincipalID = principalID;
+                dbcon.Open();
+                MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon);
+                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                if (m_ColumnNames == null)
-                {
-                    m_ColumnNames = new List<string>();
+                IDataReader result = cmd.ExecuteReader();
 
-                    DataTable schemaTable = result.GetSchemaTable();
-                    foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
-                }
-
-                foreach (string s in m_ColumnNames)
+                if (result.Read())
                 {
-                    if (s == "UUID")
-                        continue;
+                    ret.PrincipalID = principalID;
 
-                    ret.Data[s] = result[s].ToString();
-                }
+                    if (m_ColumnNames == null)
+                    {
+                        m_ColumnNames = new List<string>();
 
-                result.Close();
-                CloseReaderCommand(cmd);
+                        DataTable schemaTable = result.GetSchemaTable();
+                        foreach (DataRow row in schemaTable.Rows)
+                            m_ColumnNames.Add(row["ColumnName"].ToString());
+                    }
 
-                return ret;
-            }
+                    foreach (string s in m_ColumnNames)
+                    {
+                        if (s == "UUID")
+                            continue;
 
-            result.Close();
-            CloseReaderCommand(cmd);
+                        ret.Data[s] = result[s].ToString();
+                    }
 
-            return null;
+                    return ret;
+                }
+                else
+                {
+                    return null;
+                }
+            }
         }
 
         public bool Store(AuthenticationData data)