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/tabodbc.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/tabodbc.cpp')
| -rw-r--r-- | storage/connect/tabodbc.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp index b50e24fcbd9..5bbc9effa92 100644 --- a/storage/connect/tabodbc.cpp +++ b/storage/connect/tabodbc.cpp @@ -102,15 +102,15 @@ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) { int dop = ODBConn::noOdbcDialog; // Default for options - Desc = Connect = Cat->GetStringCatInfo(g, Name, "Connect", ""); - Tabname = Cat->GetStringCatInfo(g, Name, "Name", + Desc = Connect = Cat->GetStringCatInfo(g, "Connect", ""); + Tabname = Cat->GetStringCatInfo(g, "Name", (Catfunc & (FNC_TABLE | FNC_COL)) ? NULL : Name); - Tabname = Cat->GetStringCatInfo(g, Name, "Tabname", Tabname); - Tabowner = Cat->GetStringCatInfo(g, Name, "Owner", ""); - Tabqual = Cat->GetStringCatInfo(g, Name, "Qualifier", ""); - Qchar = Cat->GetStringCatInfo(g, Name, "Qchar", ""); - Catver = Cat->GetIntCatInfo(Name, "Catver", 2); - Options = Cat->GetIntCatInfo(Name, "Options", dop); + Tabname = Cat->GetStringCatInfo(g, "Tabname", Tabname); + Tabowner = Cat->GetStringCatInfo(g, "Owner", ""); + Tabqual = Cat->GetStringCatInfo(g, "Qualifier", ""); + Qchar = Cat->GetStringCatInfo(g, "Qchar", ""); + Catver = Cat->GetIntCatInfo("Catver", 2); + Options = Cat->GetIntCatInfo("Options", dop); Pseudo = 2; // FILID is Ok but not ROWID return false; } // end of DefineAM |