diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-03-25 11:07:45 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-03-25 11:07:45 +0100 |
commit | cd9e1938ef503b423a652aff0b5d1e0a76361fc6 (patch) | |
tree | d29da2e98a25aebacecef85bc16d721bd9afd8fb /storage/connect/tabsys.cpp | |
parent | 8f0ae6322c40aa339f9362f59715440952c34a3e (diff) | |
download | mariadb-git-cd9e1938ef503b423a652aff0b5d1e0a76361fc6.tar.gz |
- Add a new table option SEPINDEX (not used yet) and remove an unused
parameter to all catalog info functions.
modified:
storage/connect/catalog.h
storage/connect/filamvct.cpp
storage/connect/filamzip.cpp
storage/connect/ha_connect.cc
storage/connect/mycat.cc
storage/connect/mycat.h
storage/connect/reldef.cpp
storage/connect/reldef.h
storage/connect/tabdos.cpp
storage/connect/tabfmt.cpp
storage/connect/tabmul.cpp
storage/connect/tabmysql.cpp
storage/connect/tabodbc.cpp
storage/connect/tabsys.cpp
storage/connect/tabtbl.cpp
storage/connect/tabvct.cpp
storage/connect/tabwmi.cpp
storage/connect/tabxml.cpp
storage/connect/xindex.cpp
Diffstat (limited to 'storage/connect/tabsys.cpp')
-rw-r--r-- | storage/connect/tabsys.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/connect/tabsys.cpp b/storage/connect/tabsys.cpp index 4cb4000bd28..4304f2421a6 100644 --- a/storage/connect/tabsys.cpp +++ b/storage/connect/tabsys.cpp @@ -83,10 +83,10 @@ bool INIDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) else strcpy(ds, "I"); // INI tables default to I(ni) - Fn = Cat->GetStringCatInfo(g, Name, "Filename", NULL); - Cat->GetCharCatInfo(Name, "Subtype", ds, buf, sizeof(buf)); + Fn = Cat->GetStringCatInfo(g, "Filename", NULL); + Cat->GetCharCatInfo("Subtype", ds, buf, sizeof(buf)); Subtype = toupper(*buf); - Cat->GetCharCatInfo(Name, "Layout", "C", buf, sizeof(buf)); + Cat->GetCharCatInfo("Layout", "C", buf, sizeof(buf)); Layout = toupper(*buf); switch (Subtype) { @@ -94,13 +94,13 @@ bool INIDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) case 'C': case 'T': // Restricted table - Xname = Cat->GetStringCatInfo(g, Name, "Name", "?"); + Xname = Cat->GetStringCatInfo(g, "Name", "?"); if (!strcmp(Xname, "?")) Xname = NULL; if (*Fn == '?') - Fn = Cat->GetStringCatInfo(g, Name, "Database", "?"); + Fn = Cat->GetStringCatInfo(g, "Database", "?"); if (*Fn != '?') { char *p = (char*)PlugSubAlloc(g, memp, _MAX_PATH); @@ -125,7 +125,7 @@ bool INIDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) return true; } // endif Fn - Ln = Cat->GetSizeCatInfo((char*)Name, "Secsize", "8K"); + Ln = Cat->GetSizeCatInfo("Secsize", "8K"); break; default: sprintf(g->Message, MSG(INV_SUBTYPE), buf); |