diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 3450e2fa6b..e2b69538e5 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 7aa95ec345..c28c618f23 100644
Binary files a/bin/MySql.Data.dll and b/bin/MySql.Data.dll differ