aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-06-19 23:45:56 +0100
committerMelanie2010-06-19 23:45:56 +0100
commita3ebd4db3fce78544a7d0f0069b4aa386ff605e8 (patch)
tree78c20b5294c57a96f172616fb80c28377eb4ec86
parentThis is a HACK! Downright nasty. For some reason, the devs of the mysql (diff)
downloadopensim-SC_OLD-a3ebd4db3fce78544a7d0f0069b4aa386ff605e8.zip
opensim-SC_OLD-a3ebd4db3fce78544a7d0f0069b4aa386ff605e8.tar.gz
opensim-SC_OLD-a3ebd4db3fce78544a7d0f0069b4aa386ff605e8.tar.bz2
opensim-SC_OLD-a3ebd4db3fce78544a7d0f0069b4aa386ff605e8.tar.xz
Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"
Didn't do what it said on the package! This reverts commit 8643db3ef0c4dca709d85fc37240a18fd9049520.
-rw-r--r--OpenSim/Data/MySQL/MySQLMigrations.cs7
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs
index b6f714c..81a0e83 100644
--- a/OpenSim/Data/MySQL/MySQLMigrations.cs
+++ b/OpenSim/Data/MySQL/MySQLMigrations.cs
@@ -66,12 +66,6 @@ namespace OpenSim.Data.MySQL
66 return; 66 return;
67 } 67 }
68 68
69 MySqlConnection c = (MySqlConnection)conn;
70
71 Type tc = c.GetType();
72 MethodInfo miSetCommandTimeout = tc.GetMethod("SetCommandTimeout", BindingFlags.NonPublic | BindingFlags.Instance);
73 MethodInfo miClearCommandTimeout = tc.GetMethod("ClearCommandTimeout", BindingFlags.NonPublic | BindingFlags.Instance);
74 miSetCommandTimeout.Invoke(c, new Object[] { 2147483 }); // INT_MAX / 1000;
75 MySqlScript scr = new MySqlScript((MySqlConnection)conn); 69 MySqlScript scr = new MySqlScript((MySqlConnection)conn);
76 { 70 {
77 foreach (string sql in script) 71 foreach (string sql in script)
@@ -84,7 +78,6 @@ namespace OpenSim.Data.MySQL
84 scr.Execute(); 78 scr.Execute();
85 } 79 }
86 } 80 }
87 miClearCommandTimeout.Invoke(c, new Object[] { });
88 } 81 }
89 } 82 }
90} 83}