Details
-
Bug
-
Status: Closed (View Workflow)
-
Major
-
Resolution: Fixed
-
None
-
None
Description
Looking at the source code, I see that SQL_ATTR_LOGIN_TIMEOUT is set but it does nothing. The SQL_ATTR_CONNECTION_TIMEOUT and SQL_ATTR_QUERY_TIMEOUT values are also either handled but ignored or not handled at all. Since the timeouts can be controlled via the connection string, I would expect that they are controllable with the ODBC attributes as well.
Here's a patch that I think should make it work like I described:
diff --git a/ma_statement.c b/ma_statement.c
|
--- ma_statement.c
|
+++ ma_statement.c
|
@@ -2771,11 +2771,17 @@
|
break;
|
case SQL_ATTR_QUERY_TIMEOUT:
|
if ((SQLULEN)ValuePtr != 0)
|
{
|
- MADB_SetError(&Stmt->Error, MADB_ERR_01S02, "Option value changed to default (no timeout)", 0);
|
- ret= SQL_SUCCESS_WITH_INFO;
|
+ mysql_optionsv(Stmt->Connection->mariadb, MYSQL_OPT_READ_TIMEOUT, ValuePtr);
|
+ mysql_optionsv(Stmt->Connection->mariadb, MYSQL_OPT_WRITE_TIMEOUT, ValuePtr);
|
}
|
+ else
|
+ {
|
+ int Timeout = INT_MAX;
|
+ mysql_optionsv(Stmt->Connection->mariadb, MYSQL_OPT_READ_TIMEOUT, &Timeout);
|
+ mysql_optionsv(Stmt->Connection->mariadb, MYSQL_OPT_WRITE_TIMEOUT, &Timeout);
|
+ }
|
break;
|
case SQL_ATTR_RETRIEVE_DATA:
|
if ((SQLULEN)ValuePtr != SQL_RD_ON)
|
{
|
diff --git a/ma_connection.c b/ma_connection.c
|
--- ma_connection.c
|
+++ ma_connection.c
|
@@ -263,8 +263,11 @@
|
}
|
MADB_RESET(Dbc->CurrentSchema, Dbc->CatalogName);
|
}
|
break;
|
+ case SQL_ATTR_CONNECTION_TIMEOUT:
|
+ Dbc->ConnectionTimeout= (SQLUINTEGER)(SQLULEN)ValuePtr;
|
+ break;
|
case SQL_ATTR_LOGIN_TIMEOUT:
|
Dbc->LoginTimeout= (SQLUINTEGER)(SQLULEN)ValuePtr;
|
break;
|
case SQL_ATTR_METADATA_ID:
|
@@ -400,9 +403,9 @@
|
case SQL_ATTR_LOGIN_TIMEOUT:
|
*(SQLUINTEGER *)ValuePtr= Dbc->LoginTimeout;
|
break;
|
case SQL_ATTR_CONNECTION_TIMEOUT:
|
- *(SQLUINTEGER *)ValuePtr= 0;
|
+ *(SQLUINTEGER *)ValuePtr= Dbc->ConnectionTimeout;
|
break;
|
case SQL_ATTR_METADATA_ID:
|
/* SQL_ATTR_METADATA_ID is SQLUINTEGER attribute on connection level, but SQLULEN on statement level :/ */
|
*(SQLUINTEGER *)ValuePtr= Dbc->MetadataId;
|
@@ -806,14 +809,26 @@
|
{
|
mysql_optionsv(Connection->mariadb, MYSQL_INIT_COMMAND, InitCmd.str);
|
}
|
|
+ if (Connection->LoginTimeout)
|
+ mysql_optionsv(Connection->mariadb, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&Connection->LoginTimeout);
|
+
|
+ if (Connection->ConnectionTimeout)
|
+ mysql_optionsv(Connection->mariadb, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&Connection->ConnectionTimeout);
|
+
|
if (Dsn->ConnectionTimeout)
|
mysql_optionsv(Connection->mariadb, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&Dsn->ConnectionTimeout);
|
|
+ if (Connection->ReadTimeout)
|
+ mysql_optionsv(Connection->mariadb, MYSQL_OPT_READ_TIMEOUT, (const char *)&Connection->ReadTimeout);
|
+
|
if (Dsn->ReadTimeout)
|
mysql_optionsv(Connection->mariadb, MYSQL_OPT_READ_TIMEOUT, (const char *)&Dsn->ReadTimeout);
|
|
+ if (Connection->WriteTimeout)
|
+ mysql_optionsv(Connection->mariadb, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&Connection->WriteTimeout);
|
+
|
if (Dsn->WriteTimeout)
|
mysql_optionsv(Connection->mariadb, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&Dsn->WriteTimeout);
|
|
if (DSN_OPTION(Connection, MADB_OPT_FLAG_AUTO_RECONNECT)) |
Attachments
Issue Links
- is duplicated by
-
-
- Closed
-