diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-15 13:31:49 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-15 13:31:49 +0400 |
| commit | 18fc51f5a48191e0424a160f35c29764236b2047 (patch) | |
| tree | 3d5d6fe97b1b1a66a71117137870c45f3eaf1fb2 /storage/connect/tabtbl.cpp | |
| parent | 51e2806661306ae4119255528ea1ce10512409bc (diff) | |
| parent | 0993d4b4f5e5710022c5c0262b803617f8bf28c8 (diff) | |
| download | mariadb-git-18fc51f5a48191e0424a160f35c29764236b2047.tar.gz | |
Merge with 10.0-connect
Diffstat (limited to 'storage/connect/tabtbl.cpp')
| -rw-r--r-- | storage/connect/tabtbl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/connect/tabtbl.cpp b/storage/connect/tabtbl.cpp index 534834350af..2ed6c150d85 100644 --- a/storage/connect/tabtbl.cpp +++ b/storage/connect/tabtbl.cpp @@ -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; |