diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-05-02 15:55:45 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-05-02 15:55:45 +0200 |
| commit | cdbb79583778827e7ceb90f3e9230062327e0b09 (patch) | |
| tree | 1684a22d140413412e43cf7d8564645c2fbc071f /storage/connect/connect.cc | |
| parent | 006dfe52822ee3550a42a9338ad29aca012945f4 (diff) | |
| download | mariadb-git-cdbb79583778827e7ceb90f3e9230062327e0b09.tar.gz | |
- Adding fetched columns to Dynamic index key (unique only)
Fix two bugs concerning added KXYCOL's:
1 - Not set during reading
2 - Val_K not set in FastFind
modified:
storage/connect/connect.cc
storage/connect/filamtxt.h
storage/connect/tabdos.cpp
storage/connect/tabfix.cpp
storage/connect/table.cpp
storage/connect/valblk.h
storage/connect/xindex.cpp
storage/connect/xindex.h
storage/connect/xtable.h
Diffstat (limited to 'storage/connect/connect.cc')
| -rw-r--r-- | storage/connect/connect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc index daff6ffdc68..9e551f2ccc7 100644 --- a/storage/connect/connect.cc +++ b/storage/connect/connect.cc @@ -442,7 +442,7 @@ RCODE CntReadNext(PGLOBAL g, PTDB tdbp) for (PCOL colp= tdbp->GetColumns(); colp; colp= colp->GetNext()) colp->SetKcol(NULL); - ((PTDBASE)tdbp)->SetKindex(NULL); + ((PTDBASE)tdbp)->SetKindex(g, NULL); } // endif index // Save stack and allocation environment and prepare error return @@ -585,7 +585,7 @@ int CntCloseTable(PGLOBAL g, PTDB tdbp) // Make all the eventual indexes tbxp= (TDBDOX*)tdbp; - tbxp->SetKindex(NULL); + tbxp->SetKindex(g, NULL); tbxp->To_Key_Col= NULL; rc= tbxp->ResetTableOpt(g, true, ((PTDBASE)tdbp)->GetDef()->Indexable() == 1); |