diff options
author | UbitUmarov | 2017-05-06 01:25:54 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-06 01:25:54 +0100 |
commit | d9038e650a8cbacc3463c6989b5af1e8429a1e8b (patch) | |
tree | 5d1b31679650853bf9710c96dcda6bd0f45096aa /OpenSim/Data/MySQL/MySQLFramework.cs | |
parent | revert to older CSJ2K.dll since new seems have issues on linux with existent... (diff) | |
download | opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.zip opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.gz opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.bz2 opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.xz |
MySQLConnector is not a MS product
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLFramework.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLFramework.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs index 93662db..98106f0 100644 --- a/OpenSim/Data/MySQL/MySQLFramework.cs +++ b/OpenSim/Data/MySQL/MySQLFramework.cs | |||
@@ -74,7 +74,9 @@ namespace OpenSim.Data.MySQL | |||
74 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 74 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
75 | { | 75 | { |
76 | dbcon.Open(); | 76 | dbcon.Open(); |
77 | return ExecuteNonQueryWithConnection(cmd, dbcon); | 77 | int ret = ExecuteNonQueryWithConnection(cmd, dbcon); |
78 | dbcon.Close(); | ||
79 | return ret; | ||
78 | } | 80 | } |
79 | } | 81 | } |
80 | else | 82 | else |
@@ -97,12 +99,15 @@ namespace OpenSim.Data.MySQL | |||
97 | 99 | ||
98 | try | 100 | try |
99 | { | 101 | { |
100 | return cmd.ExecuteNonQuery(); | 102 | int ret = cmd.ExecuteNonQuery(); |
103 | cmd.Connection = null; | ||
104 | return ret; | ||
101 | } | 105 | } |
102 | catch (Exception e) | 106 | catch (Exception e) |
103 | { | 107 | { |
104 | m_log.Error(e.Message, e); | 108 | m_log.Error(e.Message, e); |
105 | m_log.Error(Environment.StackTrace.ToString()); | 109 | m_log.Error(Environment.StackTrace.ToString()); |
110 | cmd.Connection = null; | ||
106 | return 0; | 111 | return 0; |
107 | } | 112 | } |
108 | } | 113 | } |