From e039a8c8c23a6a3b2b9a5019de09f758a84c74ec Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 15 Oct 2010 15:43:06 -0700
Subject: UPdated the MySql driver to 6.2.4. Also established a much larger
 MySqlCommand timeout on fetching prims.

---
 OpenSim/Data/MySQL/MySQLSimulationData.cs |   1 +
 bin/MySql.Data.dll                        | Bin 335872 -> 360448 bytes
 2 files changed, 1 insertion(+)

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 3450e2f..e2b6953 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -424,6 +424,7 @@ namespace OpenSim.Data.MySQL
                         cmd.CommandText =
                             "SELECT * FROM prims LEFT JOIN primshapes ON prims.UUID = primshapes.UUID WHERE RegionUUID = ?RegionUUID";
                         cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                        cmd.CommandTimeout = 3600;
 
                         using (IDataReader reader = ExecuteReader(cmd))
                         {
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll
index 7aa95ec..c28c618 100644
Binary files a/bin/MySql.Data.dll and b/bin/MySql.Data.dll differ
-- 
cgit v1.1