diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-13 17:24:31 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-13 17:24:31 +0100 |
| commit | 70b4e6d368671773cb75830b672c871b2c47b887 (patch) | |
| tree | 3a388ca14a2a5337f051db5b081c3fb841109089 /storage/connect/odbccat.h | |
| parent | 85c65f4e1caa0dd28bc279ee1e83712f57ba3747 (diff) | |
| download | mariadb-git-70b4e6d368671773cb75830b672c871b2c47b887.tar.gz | |
- Add ConnectTimout and QueryTimout options for ODBC tables. Should
fix MDEV-7415. (To be specified in option_list)
modified:
storage/connect/ha_connect.cc
storage/connect/odbccat.h
storage/connect/odbconn.cpp
storage/connect/odbconn.h
storage/connect/tabodbc.cpp
storage/connect/tabodbc.h
Diffstat (limited to 'storage/connect/odbccat.h')
| -rw-r--r-- | storage/connect/odbccat.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/storage/connect/odbccat.h b/storage/connect/odbccat.h index 9cc14695977..8642d915211 100644 --- a/storage/connect/odbccat.h +++ b/storage/connect/odbccat.h @@ -1,3 +1,7 @@ +// Timeout and net wait defaults +#define DEFAULT_LOGIN_TIMEOUT -1 // means do not set +#define DEFAULT_QUERY_TIMEOUT -1 // means do not set + /***********************************************************************/ /* ODBC catalog function prototypes. */ /***********************************************************************/ @@ -6,8 +10,8 @@ char *ODBCCheckConnection(PGLOBAL g, char *dsn, int cop); #endif // PROMPT_OK PQRYRES ODBCDataSources(PGLOBAL g, int maxres, bool info); PQRYRES ODBCColumns(PGLOBAL g, char *dsn, char *db, char *table, - char *colpat, int maxres, bool info); -PQRYRES ODBCSrcCols(PGLOBAL g, char *dsn, char *src); + char *colpat, int maxres, int cto, int qto, bool info); +PQRYRES ODBCSrcCols(PGLOBAL g, char *dsn, char *src, int cto, int qto); PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *db, char *tabpat, - int maxres, bool info); + int maxres, int cto, int qto, bool info); PQRYRES ODBCDrivers(PGLOBAL g, int maxres, bool info); |