summaryrefslogtreecommitdiff
path: root/storage/connect/odbconn.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-12-19 12:56:06 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2013-12-19 12:56:06 +0100
commitd05ccc23249809633a45062e1c698b87cd3b21c5 (patch)
tree3e456a1c1c2cb97149fd17101d7c87fd4f39ca5b /storage/connect/odbconn.cpp
parentd253599b83cc122573d96771db895af4e0398be7 (diff)
downloadmariadb-git-d05ccc23249809633a45062e1c698b87cd3b21c5.tar.gz
- Add extra column info in discovery
modified: storage/connect/ha_connect.cc storage/connect/myconn.cpp storage/connect/odbconn.cpp storage/connect/plgdbsem.h
Diffstat (limited to 'storage/connect/odbconn.cpp')
-rw-r--r--storage/connect/odbconn.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index 04cec2b85c0..45deeedd2a7 100644
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -287,9 +287,9 @@ PQRYRES ODBCColumns(PGLOBAL g, char *dsn, char *db, char *table,
int buftyp[] = {TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING,
TYPE_SHORT, TYPE_STRING, TYPE_INT, TYPE_INT,
TYPE_SHORT, TYPE_SHORT, TYPE_SHORT, TYPE_STRING};
- XFLD fldtyp[] = {FLD_QUALIF, FLD_OWNER, FLD_TABNAME, FLD_NAME,
- FLD_TYPE, FLD_TYPENAME, FLD_PREC, FLD_LENGTH,
- FLD_SCALE, FLD_RADIX, FLD_NULL, FLD_REM};
+ XFLD fldtyp[] = {FLD_CAT, FLD_SCHEM, FLD_TABNAME, FLD_NAME,
+ FLD_TYPE, FLD_TYPENAME, FLD_PREC, FLD_LENGTH,
+ FLD_SCALE, FLD_RADIX, FLD_NULL, FLD_REM};
unsigned int length[] = {0, 0, 0, 0, 6, 0, 10, 10, 6, 6, 6, 0};
int n, ncol = 12;
PQRYRES qrp;
@@ -565,8 +565,8 @@ PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *db, char *tabpat,
{
int buftyp[] = {TYPE_STRING, TYPE_STRING, TYPE_STRING,
TYPE_STRING, TYPE_STRING};
- XFLD fldtyp[] = {FLD_QUALIF, FLD_OWNER, FLD_NAME,
- FLD_TYPE, FLD_REM};
+ XFLD fldtyp[] = {FLD_CAT, FLD_SCHEM, FLD_NAME,
+ FLD_TYPE, FLD_REM};
unsigned int length[] = {0, 0, 0, 16, 0};
int n, ncol = 5;
PQRYRES qrp;