From e984bfb4c63718d5176b17f6beea46f4512cf304 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 14:31:39 -0700
Subject: This should have a strong effect on the Unknown User issue mantis
 #6625

---
 OpenSim/Data/MySQL/MySQLGridUserData.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index a9ce94d..df1ecc6 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Data.MySQL
 
         public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "GridUserStore") {}
 
-        public GridUserData Get(string userID)
+        public new GridUserData Get(string userID)
         {
             GridUserData[] ret = Get("UserID", userID);
 
@@ -56,6 +56,9 @@ namespace OpenSim.Data.MySQL
             return ret[0];
         }
 
-
+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get("UserID LIKE {0}%", userID);
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 2c05caec7fcf14c7e61c2f66854fc24f06d5b480 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 15:47:02 -0700
Subject: Really make it call the method with the query interface

---
 OpenSim/Data/MySQL/MySQLGridUserData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index df1ecc6..f476fd2 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MySQL
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get("UserID LIKE {0}%", userID);
+            return base.Get(String.Format("UserID LIKE {0}%", userID));
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 316e8f92391f561d459bc6240ccd78b0a98c20c6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 16:10:09 -0700
Subject: Fix SQL statement

---
 OpenSim/Data/MySQL/MySQLGridUserData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index f476fd2..00560c1 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MySQL
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get(String.Format("UserID LIKE {0}%", userID));
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 068a3afad9b585399e5422108f8c5074c9e6b33f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 09:51:31 -0700
Subject: HG Friends: migration #3 is failing on some installations of MySql.
 Setting the table to InnoDB seems to fix the problem.

---
 OpenSim/Data/MySQL/Resources/FriendsStore.migrations | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 55d82ec..5faf956 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -9,7 +9,7 @@ CREATE TABLE `Friends` (
 	`Offered` VARCHAR(32) NOT NULL DEFAULT 0, 
 	PRIMARY KEY(`PrincipalID`, `Friend`), 
 	KEY(`PrincipalID`)
-);
+) ENGINE=InnoDB;
 
 COMMIT;
 
-- 
cgit v1.1