mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 11:27:39 +02:00
- 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
This commit is contained in:
parent
be268bed3d
commit
99d95c8a2f
17 changed files with 442 additions and 416 deletions
|
|
@ -178,15 +178,13 @@ static int dbfhead(PGLOBAL g, FILE *file, PSZ fn, DBFHEADER *buf)
|
|||
/****************************************************************************/
|
||||
PQRYRES DBFColumns(PGLOBAL g, const char *fn, 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,
|
||||
FLD_PREC, FLD_LENGTH, FLD_SCALE};
|
||||
static unsigned int length[] = {11, 6, 8, 10, 10, 6};
|
||||
char buf[2], filename[_MAX_PATH];
|
||||
int ncol = sizeof(dbtype) / sizeof(int);
|
||||
int ncol = sizeof(buftyp) / sizeof(int);
|
||||
int rc, type, len, field, fields;
|
||||
BOOL bad;
|
||||
DBFHEADER mainhead;
|
||||
|
|
@ -228,8 +226,7 @@ PQRYRES DBFColumns(PGLOBAL g, const char *fn, BOOL info)
|
|||
fields = 0;
|
||||
|
||||
qrp = PlgAllocResult(g, ncol, fields, IDS_COLUMNS + 3,
|
||||
dbtype, buftyp, fldtyp, length, true, false);
|
||||
//qrp->Info = info || (rc == RC_INFO);
|
||||
buftyp, fldtyp, length, true, false);
|
||||
|
||||
if (info)
|
||||
return qrp;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue