mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- Implement the SERVID special columns. This imply modifying the way
special columns are processed. This will be documented. Also some code cleanup and some changes to prepare the indexing of nullable columns (not achieve yet) modified: storage/connect/colblk.cpp storage/connect/colblk.h storage/connect/connect.cc storage/connect/connect.h storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/macutil.cpp storage/connect/mycat.cc storage/connect/plgdbsem.h storage/connect/reldef.cpp storage/connect/reldef.h storage/connect/table.cpp storage/connect/tabmysql.cpp storage/connect/tabmysql.h storage/connect/tabodbc.h storage/connect/tabtbl.cpp storage/connect/tabutil.h storage/connect/value.h storage/connect/xindex.cpp storage/connect/xindex.h storage/connect/xtable.h
This commit is contained in:
@@ -380,7 +380,8 @@ int TDBTBL::GetMaxSize(PGLOBAL g)
|
||||
void TDBTBL::ResetDB(void)
|
||||
{
|
||||
for (PCOL colp = Columns; colp; colp = colp->GetNext())
|
||||
if (colp->GetAmType() == TYPE_AM_TABID)
|
||||
if (colp->GetAmType() == TYPE_AM_TABID ||
|
||||
colp->GetAmType() == TYPE_AM_SRVID)
|
||||
colp->COLBLK::Reset();
|
||||
|
||||
for (PTABLE tabp = Tablist; tabp; tabp = tabp->GetNext())
|
||||
@@ -492,7 +493,8 @@ int TDBTBL::ReadDB(PGLOBAL g)
|
||||
|
||||
// Check and initialize the subtable columns
|
||||
for (PCOL cp = Columns; cp; cp = cp->GetNext())
|
||||
if (cp->GetAmType() == TYPE_AM_TABID)
|
||||
if (cp->GetAmType() == TYPE_AM_TABID ||
|
||||
cp->GetAmType() == TYPE_AM_SRVID)
|
||||
cp->COLBLK::Reset();
|
||||
else if (((PPRXCOL)cp)->Init(g) && !Accept)
|
||||
return RC_FX;
|
||||
|
Reference in New Issue
Block a user