Date: Tuesday, October 10, 2006 @ 11:14:27
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: config/mysequoia.conf (1.8 -> 1.9) include/CarobMySQL.hpp (1.38
-> 1.39) src/CarobMySQL.cpp (1.84 -> 1.85)
Reverted the changes to LMS-25
------------------------+
config/mysequoia.conf | 1 -
include/CarobMySQL.hpp | 2 --
src/CarobMySQL.cpp | 9 +++------
3 files changed, 3 insertions(+), 9 deletions(-)
Index: libmysequoia/config/mysequoia.conf
diff -u libmysequoia/config/mysequoia.conf:1.8
libmysequoia/config/mysequoia.conf:1.9
--- libmysequoia/config/mysequoia.conf:1.8 Mon Oct 9 16:34:17 2006
+++ libmysequoia/config/mysequoia.conf Tue Oct 10 11:14:26 2006
@@ -7,4 +7,3 @@
;host = node1 node2
;database = DB1
;persistent_connection = false
-;socket_timeout = 0
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.38
libmysequoia/include/CarobMySQL.hpp:1.39
--- libmysequoia/include/CarobMySQL.hpp:1.38 Mon Oct 9 16:34:17 2006
+++ libmysequoia/include/CarobMySQL.hpp Tue Oct 10 11:14:27 2006
@@ -290,8 +290,6 @@
Converter conv;
// persistent connection
bool usePersistentConnection;
- // socket timeout
- long socketTimeout;
/**
* Private default constructor.
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.84
libmysequoia/src/CarobMySQL.cpp:1.85
--- libmysequoia/src/CarobMySQL.cpp:1.84 Mon Oct 9 16:34:17 2006
+++ libmysequoia/src/CarobMySQL.cpp Tue Oct 10 11:14:27 2006
@@ -40,7 +40,7 @@
using namespace std;
CarobMYSQL::CarobMYSQL (MYSQL *mysql, my_bool free_me) :
- connectionPtr(0), stmtPtr(0), drsPtr(0), liveResultPtr(0),
usePersistentConnection(true), socketTimeout(0)
+ connectionPtr(0), stmtPtr(0), drsPtr(0), liveResultPtr(0),
usePersistentConnection(true)
{
LOG4CXX_DEBUG(logger, "Entering constructor; mysql=" << mysql << " free_me="
<< (bool) free_me);
static char version[6];
@@ -201,7 +201,7 @@
}
// we can retrieve the warnings only if we have persistent connection
- ConnectionParameters connectionParameters(ctrls, to_wstring(db),
to_wstring(user), to_wstring(passwd), ht.getPolicy(), usePersistentConnection,
usePersistentConnection?true:false, socketTimeout);
+ ConnectionParameters connectionParameters(ctrls, to_wstring(db),
to_wstring(user), to_wstring(passwd), ht.getPolicy(), usePersistentConnection,
usePersistentConnection?true:false);
Connection *newConnectionPtr = new Connection(connectionParameters);
@@ -211,7 +211,7 @@
delete_connection();
set_connect_info(host, user, passwd, db, port);
- LOG4CXX_INFO(logger, "Connected: host=" << host << " user=" << user <<
" passwd=" << passwd << " db=" << db << " port=" << port << "
persistent_connection=" << usePersistentConnection << " socket timeout=" <<
socketTimeout);
+ LOG4CXX_INFO(logger, "Connected: host=" << host << " user=" << user <<
" passwd=" << passwd << " db=" << db << " port=" << port << "
persistent_connection=" << usePersistentConnection);
reset_error();
@@ -1181,9 +1181,6 @@
if (strncmp(ini.get(group, "persistent_connection").c_str(), "false", 5) ==
0)
usePersistentConnection = false;
- /* set socket timeout */
- socketTimeout = atol(ini.get(group, "socket_timeout").c_str());
-
LOG4CXX_DEBUG(logger, "Leaving read_ini_file.");
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
