- In info, the file length sometimes could not be caculated because the

  catalog data path had not been set. This was added into ha_connect::info.
modified:
  storage/connect/ha_connect.cc

- All the functions querying table options could return information from the wrong
  table when several CONNECT tables were used in the same query (for instance joined
  together) This was because they belonged to the catalog class that is shared between
  all tables in the same query. They have been moved from the catalog class to the
  TABDEF/RELDEF class that is attached to each table. This was a major potential bug.
modified:
  storage/connect/catalog.h
  storage/connect/filamvct.cpp
  storage/connect/filamzip.cpp
  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/taboccur.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabpivot.cpp
  storage/connect/tabsys.cpp
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabvct.cpp
  storage/connect/tabwmi.cpp
  storage/connect/tabxcl.cpp
  storage/connect/tabxml.cpp
  storage/connect/xindex.cpp

- Prepare indexing of MYSQL/ODBC tables (as does FEDERATED) (Not implemented yet)
modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/mycat.h

- Typo
modified:
  storage/connect/plgdbutl.cpp

1 files changed, 4 insertions, 6 deletions

diff --git a/storage/connect/filamzip.cpp b/storage/connect/filamzip.cpp
index 9d0ffab32d9..0ec9e65c17e 100644
--- a/storage/connect/filamzip.cpp
+++ b/storage/connect/filamzip.cpp
@@ -543,13 +543,12 @@ int ZBKFAM::DeleteRecords(PGLOBAL g, int irc)
   if (irc == RC_EF) {
     LPCSTR  name = Tdbp->GetName();
     PDOSDEF defp = (PDOSDEF)Tdbp->GetDef();
-    PCATLG  cat = PlgGetCatalog(g);
 
     defp->SetBlock(0);
     defp->SetLast(Nrec);
 
-    if (!cat->SetIntCatInfo("Blocks", 0) ||
-        !cat->SetIntCatInfo("Last", 0)) {
+    if (!defp->SetIntCatInfo("Blocks", 0) ||
+        !defp->SetIntCatInfo("Last", 0)) {
       sprintf(g->Message, MSG(UPDATE_ERROR), "Header");
       return RC_FX;
     } else
@@ -568,7 +567,6 @@ void ZBKFAM::CloseTableFile(PGLOBAL g)
   int rc = RC_OK;
 
   if (Tdbp->GetMode() == MODE_INSERT) {
-    PCATLG  cat = PlgGetCatalog(g);
     LPCSTR  name = Tdbp->GetName();
     PDOSDEF defp = (PDOSDEF)Tdbp->GetDef();
 
@@ -587,8 +585,8 @@ void ZBKFAM::CloseTableFile(PGLOBAL g)
     if (rc != RC_FX) {
       defp->SetBlock(Block);
       defp->SetLast(Last);
-      cat->SetIntCatInfo("Blocks", Block);
-      cat->SetIntCatInfo("Last", Last);
+      defp->SetIntCatInfo("Blocks", Block);
+      defp->SetIntCatInfo("Last", Last);
       } // endif
 
     gzclose(Zfile);