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/tabwmi.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/tabwmi.cpp')
| -rw-r--r-- | storage/connect/tabwmi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/tabwmi.cpp b/storage/connect/tabwmi.cpp index 789994ad8f7..d89d61dc11c 100644 --- a/storage/connect/tabwmi.cpp +++ b/storage/connect/tabwmi.cpp @@ -337,8 +337,8 @@ PQRYRES WMIColumns(PGLOBAL g, char *nsp, char *cls, bool info) /***********************************************************************/ bool WMIDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) { - Nspace = Cat->GetStringCatInfo(g, Name, "Namespace", "Root\\CimV2"); - Wclass = Cat->GetStringCatInfo(g, Name, "Class", + Nspace = Cat->GetStringCatInfo(g, "Namespace", "Root\\CimV2"); + Wclass = Cat->GetStringCatInfo(g, "Class", (!stricmp(Nspace, "root\\cimv2") ? "ComputerSystemProduct" : !stricmp(Nspace, "root\\cli") ? "Msft_CliAlias" : "")); @@ -351,7 +351,7 @@ bool WMIDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) } // endif Wclass if (Catfunc == FNC_NO) - Ems = Cat->GetIntCatInfo(Name, "Estimate", 100); + Ems = Cat->GetIntCatInfo("Estimate", 100); return false; } // end of DefineAM |