diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-11-22 16:03:54 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-11-22 16:03:54 +0100 |
| commit | aaa982e7908b4d8464e9ac799336c5d890f72fad (patch) | |
| tree | 5b6b8e48816f17505200d0626eb1e3c2e233035d /storage/connect/odbccat.h | |
| parent | 8780e1ab24ff2671d200bd6eb14cd98d620ab361 (diff) | |
| download | mariadb-git-aaa982e7908b4d8464e9ac799336c5d890f72fad.tar.gz | |
- Fix good recognition of MYSQL table column types.
modified:
storage/connect/ha_connect.cc
storage/connect/myconn.cpp
storage/connect/myutil.cpp
storage/connect/odbccat.h
storage/connect/odbconn.cpp
storage/connect/tabmysql.cpp
- Add tests on new MYSQL features
added:
storage/connect/mysql-test/connect/my.cnf
storage/connect/mysql-test/connect/r/mysql_discovery.result
storage/connect/mysql-test/connect/r/mysql_exec.result
storage/connect/mysql-test/connect/r/mysql_new.result
storage/connect/mysql-test/connect/t/myconn.inc
storage/connect/mysql-test/connect/t/myconn_cleanup.inc
storage/connect/mysql-test/connect/t/mysql_discovery.test
storage/connect/mysql-test/connect/t/mysql_exec.test
storage/connect/mysql-test/connect/t/mysql_new.test
Diffstat (limited to 'storage/connect/odbccat.h')
| -rw-r--r-- | storage/connect/odbccat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/connect/odbccat.h b/storage/connect/odbccat.h index ba4074bf276..1c89334f5a9 100644 --- a/storage/connect/odbccat.h +++ b/storage/connect/odbccat.h @@ -1,7 +1,9 @@ /***********************************************************************/ /* ODBC catalog function prototypes. */ /***********************************************************************/ +#if defined(PROMPT_OK) char *ODBCCheckConnection(PGLOBAL g, char *dsn, int cop); +#endif // PROMPT_OK PQRYRES ODBCDataSources(PGLOBAL g, bool info); PQRYRES ODBCColumns(PGLOBAL g, char *dsn, char *table, char *colpat, bool info); |