changed set|getTimeout() => set|getLoginTimeout()

added set|getConnectionTimeout()

Data/MySQL/include/Poco/Data/MySQL/Connector.h

@@ -63,7 +63,7 @@ public:
 		/// Returns the name associated with this connector.
 
 	virtual Poco::AutoPtr<Poco::Data::SessionImpl> createSession(const std::string& connectionString,
-		std::size_t timeout = Poco::Data::SessionImpl::CONNECT_TIMEOUT_DEFAULT);
+		std::size_t timeout = Poco::Data::SessionImpl::LOGIN_TIMEOUT_DEFAULT);
 		/// Creates a MySQL SessionImpl object and initializes it with the given connectionString.
 		
 	static void registerConnector();

Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h

@@ -63,7 +63,7 @@ public:
 	static const std::string MYSQL_SERIALIZABLE;
 
 	SessionImpl(const std::string& connectionString,
-		std::size_t timeout = CONNECT_TIMEOUT_DEFAULT);
+		std::size_t loginTimeout = LOGIN_TIMEOUT_DEFAULT);
 		/// Creates the SessionImpl. Opens a connection to the database
 		///
 		/// Connection string format:
@@ -91,6 +91,12 @@ public:
 	bool isConnected();
 		/// Returns true if connected, false otherwise.
 
+	void setConnectionTimeout(std::size_t timeout);
+		/// Sets the session connection timeout value.
+
+	std::size_t getConnectionTimeout();
+		/// Returns the session connection timeout value.
+
 	void begin();
 		/// Starts a transaction
 	
@@ -171,6 +177,7 @@ private:
 	SessionHandle   _handle;
 	bool            _connected;
 	bool            _inTransaction;
+	std::size_t     _timeout;
 	Poco::FastMutex _mutex;
 };
 
@@ -207,12 +214,30 @@ inline const std::string& SessionImpl::connectorName()
 }
 
 
+inline bool SessionImpl::isTransaction()
+{
+	return _inTransaction;
+}
+
+
 inline bool SessionImpl::isTransactionIsolation(Poco::UInt32 ti)
 {
 	return getTransactionIsolation() == ti;
 }
 
 
+inline bool SessionImpl::isConnected()
+{
+	return _connected;
+}
+	
+
+inline std::size_t SessionImpl::getConnectionTimeout()
+{
+	return _timeout;
+}
+
+
 template <>
 inline std::string& SessionImpl::getValue(MYSQL_BIND* pResult, std::string& val)
 {