diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-05-10 20:22:21 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-05-10 20:22:21 +0200 |
| commit | 99d95c8a2fec8037738a4c700a163b206f9ab4c8 (patch) | |
| tree | eeeaad356e4ac73bec038e33f44b33966abb0da4 /storage/connect/tabfmt.cpp | |
| parent | be268bed3d893ef053ff35a4900cc1c125bb5769 (diff) | |
| download | mariadb-git-99d95c8a2fec8037738a4c700a163b206f9ab4c8.tar.gz | |
- Added table type PIVOT
modified:
storage/connect/filamdbf.cpp
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/mycat.cc
storage/connect/myconn.cpp
storage/connect/odbconn.cpp
storage/connect/plgcnx.h
storage/connect/plgdbsem.h
storage/connect/plgdbutl.cpp
storage/connect/tabfmt.cpp
storage/connect/tabpivot.cpp
storage/connect/tabpivot.h
storage/connect/tabutil.cpp
storage/connect/tabwmi.cpp
storage/connect/tabxcl.cpp
storage/connect/value.cpp
storage/connect/value.h
Diffstat (limited to 'storage/connect/tabfmt.cpp')
| -rw-r--r-- | storage/connect/tabfmt.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/connect/tabfmt.cpp b/storage/connect/tabfmt.cpp index 51631107f6e..aaa32a57f04 100644 --- a/storage/connect/tabfmt.cpp +++ b/storage/connect/tabfmt.cpp @@ -78,8 +78,6 @@ extern "C" int trace; PQRYRES CSVColumns(PGLOBAL g, const char *fn, char sep, char q, int hdr, int mxr, bool info) { - static int dbtype[] = {DB_CHAR, DB_SHORT, DB_CHAR, - DB_INT, DB_INT, DB_SHORT}; static int buftyp[] = {TYPE_STRING, TYPE_SHORT, TYPE_STRING, TYPE_INT, TYPE_INT, TYPE_SHORT}; static XFLD fldtyp[] = {FLD_NAME, FLD_TYPE, FLD_TYPENAME, @@ -87,7 +85,7 @@ PQRYRES CSVColumns(PGLOBAL g, const char *fn, char sep, char q, static unsigned int length[] = {6, 6, 8, 10, 10, 6}; char *p, *colname[MAXCOL], dechar, filename[_MAX_PATH], buf[4096]; int i, imax, hmax, n, nerr, phase, blank, digit, dec, type; - int ncol = sizeof(dbtype) / sizeof(int); + int ncol = sizeof(buftyp) / sizeof(int); int num_read = 0, num_max = 10000000; // Statistics int len[MAXCOL], typ[MAXCOL], prc[MAXCOL]; FILE *infile; @@ -341,7 +339,7 @@ PQRYRES CSVColumns(PGLOBAL g, const char *fn, char sep, char q, /* Allocate the structures used to refer to the result set. */ /*********************************************************************/ qrp = PlgAllocResult(g, ncol, imax, IDS_COLUMNS + 3, - dbtype, buftyp, fldtyp, length, true, false); + buftyp, fldtyp, length, true, false); qrp->Nblin = imax; if (info) |