diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-01-17 19:39:49 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-01-17 19:39:49 +0100 |
| commit | 82913b0e909a3b8f10138f7f7cc759301f4c2026 (patch) | |
| tree | 16aee581e5484379ce433bb91c5638ab75e31a0d /storage/connect/filamdbf.cpp | |
| parent | 43147681503299ccdf31e23e84dd39aeff52b2df (diff) | |
| download | mariadb-git-82913b0e909a3b8f10138f7f7cc759301f4c2026.tar.gz | |
Commit changes made for version 10.1
Diffstat (limited to 'storage/connect/filamdbf.cpp')
| -rw-r--r-- | storage/connect/filamdbf.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/storage/connect/filamdbf.cpp b/storage/connect/filamdbf.cpp index a4557facbd8..8b9d436d626 100644 --- a/storage/connect/filamdbf.cpp +++ b/storage/connect/filamdbf.cpp @@ -281,15 +281,25 @@ PQRYRES DBFColumns(PGLOBAL g, char *dp, const char *fn, bool info) /************************************************************************/ switch (thisfield.Type) { case 'C': // Characters - case 'L': // Logical 'T' or 'F' - type = TYPE_STRING; + case 'L': // Logical 'T' or 'F' or space + type = TYPE_STRING; + break; + case 'M': // Memo a .DBT block number + case 'B': // Binary a .DBT block number + case 'G': // Ole a .DBT block number + type = TYPE_STRING; break; + //case 'I': // Long + //case '+': // Autoincrement + // type = TYPE_INT; + // break; case 'N': type = (thisfield.Decimals) ? TYPE_DOUBLE : (len > 10) ? TYPE_BIGINT : TYPE_INT; break; - case 'F': - type = TYPE_DOUBLE; + case 'F': // Float + //case 'O': // Double + type = TYPE_DOUBLE; break; case 'D': type = TYPE_DATE; // Is this correct ??? @@ -441,6 +451,7 @@ int DBFFAM::Cardinality(PGLOBAL g) if (Accept) { Lrecl = rln; + Blksize = Nrec * rln; PushWarning(g, Tdbp); } else return -1; |