diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-12 12:34:14 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-12 12:34:14 +0100 |
| commit | 88c76f3b70def1a26f15c7ea23759369ba28392d (patch) | |
| tree | 87b9e449177ddecf4a12f205da84ab40644e3c42 /storage/connect/tabfmt.cpp | |
| parent | b91386c2f6964c03de353aa5155e06098055de09 (diff) | |
| download | mariadb-git-88c76f3b70def1a26f15c7ea23759369ba28392d.tar.gz | |
All use of a character to represent table types or
catalog functions have been changed:
Table_types are now internally represented be enum TABTYPE.
Catalog function names are internally translated to a uint.
The function GetTypeID was modified accordingly and a new
function GetFuncID was implemented in mycat.cc.
Modified:
ha_connect.cc
odbccat.h
odbconn.cpp
tabodbc.cpp
tabfmt.cpp
tabmysql.h
tabmysql.cpp
tabwmi.cpp
mycat.h
mycat.cc
plgdbsem.h
reldef.h
tabdos.cpp
rcmsg.h
Diffstat (limited to 'storage/connect/tabfmt.cpp')
| -rw-r--r-- | storage/connect/tabfmt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/tabfmt.cpp b/storage/connect/tabfmt.cpp index 6834ca5ea28..a046fe771e5 100644 --- a/storage/connect/tabfmt.cpp +++ b/storage/connect/tabfmt.cpp @@ -49,6 +49,7 @@ /***********************************************************************/ #include "global.h" #include "plgdbsem.h" +#include "mycat.h" #include "filamap.h" #if defined(ZIP_SUPPORT) #include "filamzip.h" @@ -405,7 +406,7 @@ bool CSVDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) char buf[8]; // Double check correctness of offset values - if (!Catfunc) + if (Catfunc == FNC_NO) for (PCOLDEF cdp = To_Cols; cdp; cdp = cdp->GetNext()) if (cdp->GetOffset() < 1) { strcpy(g->Message, MSG(BAD_OFFSET_VAL)); @@ -441,7 +442,7 @@ PTDB CSVDEF::GetTable(PGLOBAL g, MODE mode) { PTDBASE tdbp; - if (Catfunc != 'C') { + if (Catfunc != FNC_COL) { USETEMP tmp = PlgGetUser(g)->UseTemp; bool map = Mapped && mode != MODE_INSERT && !(tmp != TMP_NO && mode == MODE_UPDATE) && |