database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

All use of a character to represent table types or

Browse Source 
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
This commit is contained in:
Olivier Bertrand
2013-02-12 12:34:14 +01:00
parent b91386c2f6
commit 88c76f3b70
14 changed files with 276 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/connect/tabodbc.cpp
View File

@@ -64,6 +64,7 @@
/***********************************************************************/
#include "global.h"
#include "plgdbsem.h"
#include "mycat.h"
#include "xtable.h"
#include "tabodbc.h"
#include "odbccat.h"
@@ -102,7 +103,7 @@ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
Desc = Connect = Cat->GetStringCatInfo(g, Name, "Connect", "");
Tabname = Cat->GetStringCatInfo(g, Name, "Name",
Catfunc == 'T' ? NULL : 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", "");
@@ -125,16 +126,16 @@ PTDB ODBCDEF::GetTable(PGLOBAL g, MODE m)
/* Column blocks will be allocated only when needed. */
/*********************************************************************/
switch (Catfunc) {
case 'C':
case FNC_COL:
tdbp = new(g) TDBOCL(this);
break;
case 'T':
case FNC_TABLE:
tdbp = new(g) TDBOTB(this);
break;
case 'S':
case FNC_DSN:
tdbp = new(g) TDBSRC(this);
break;
case 'D':
case FNC_DRIVER:
tdbp = new(g) TDBDRV(this);
break;
default:
@@ -950,7 +951,7 @@ PQRYRES TDBOTB::GetResult(PGLOBAL g)
/***********************************************************************/
PQRYRES TDBOCL::GetResult(PGLOBAL g)
{
return MyODBCCols(g, Dsn, Tab, false);
return ODBCColumns(g, Dsn, Tab, NULL, false);
} // end of GetResult
/* ------------------------ End of Tabodbc --------------------------- */