summaryrefslogtreecommitdiff
path: root/storage/connect/odbccat.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-03-19 12:21:08 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-03-19 12:21:08 +0100
commit7733b247e1fae603b8a439cf03bc47c345a88370 (patch)
tree055ad753211126eb244ece16cd328fa893168267 /storage/connect/odbccat.h
parent73d042755345bbc113f6711ce03fd932e72aacd7 (diff)
downloadmariadb-git-7733b247e1fae603b8a439cf03bc47c345a88370.tar.gz
Same changes than in version 10.0.17
Diffstat (limited to 'storage/connect/odbccat.h')
-rw-r--r--storage/connect/odbccat.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/storage/connect/odbccat.h b/storage/connect/odbccat.h
index 8642d915211..1b5febadd3a 100644
--- a/storage/connect/odbccat.h
+++ b/storage/connect/odbccat.h
@@ -2,6 +2,14 @@
#define DEFAULT_LOGIN_TIMEOUT -1 // means do not set
#define DEFAULT_QUERY_TIMEOUT -1 // means do not set
+typedef struct odbc_parms {
+ char *User; // User connect info
+ char *Pwd; // Password connect info
+ int Cto; // Connect timeout
+ int Qto; // Query timeout
+ bool UseCnc; // Use SQLConnect (!SQLDriverConnect)
+ } ODBCPARM, *POPARM;
+
/***********************************************************************/
/* ODBC catalog function prototypes. */
/***********************************************************************/
@@ -10,8 +18,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, int cto, int qto, bool info);
-PQRYRES ODBCSrcCols(PGLOBAL g, char *dsn, char *src, int cto, int qto);
+ char *colpat, int maxres, bool info, POPARM sop);
+PQRYRES ODBCSrcCols(PGLOBAL g, char *dsn, char *src, POPARM sop);
PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *db, char *tabpat,
- int maxres, int cto, int qto, bool info);
+ int maxres, bool info, POPARM sop);
PQRYRES ODBCDrivers(PGLOBAL g, int maxres, bool info);