- Allowing views and queries as parameters for PROXY base tables

  NOTE: Checking for looping references cannot be done when using views
  as parameters. This should not be allowed on production servers and
  should be dependant on a system variable and/or on speciel grant.

modified:
  storage/connect/CMakeLists.txt
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/myconn.h
  storage/connect/mysql-test/connect/r/fmt.result
  storage/connect/mysql-test/connect/r/pivot.result
  storage/connect/mysql-test/connect/t/fmt.test
  storage/connect/mysql-test/connect/t/pivot.test
  storage/connect/plgdbsem.h
  storage/connect/plugutil.c
  storage/connect/tabcol.cpp
  storage/connect/tabcol.h
  storage/connect/tabfmt.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/xtable.h

1 files changed, 8 insertions, 8 deletions

diff --git a/storage/connect/tabcol.h b/storage/connect/tabcol.h
index 4680e50f29e..20e23b80225 100644
--- a/storage/connect/tabcol.h
+++ b/storage/connect/tabcol.h
@@ -1,7 +1,7 @@
 /*************** TabCol H Declares Source Code File (.H) ***************/
-/*  Name: TABCOL.H    Version 2.7                                      */
+/*  Name: TABCOL.H    Version 2.8                                      */
 /*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          1998-2012    */
+/*  (C) Copyright to the author Olivier BERTRAND          1998-2013    */
 /*                                                                     */
 /*  This file contains the XTAB, COLUMN and XORDER class definitions.  */
 /***********************************************************************/
@@ -15,23 +15,23 @@
 /***********************************************************************/
 /*  Definition of class XTAB with all its method functions.            */
 /***********************************************************************/
-class DllExport XTAB: public BLOCK {  // Table Name-Owner-Correl block.
+class DllExport XTAB: public BLOCK {  // Table Name-Owner-Srcdef block.
   friend class TDBPRX;
  public:
   // Constructors
-  XTAB(LPCSTR name, LPCSTR correl = NULL);
+  XTAB(LPCSTR name, LPCSTR srcdef = NULL);
   XTAB(PTABLE tp);
 
   // Implementation
   PTABLE GetNext(void) {return Next;}
   PTDB   GetTo_Tdb(void) {return To_Tdb;}
   LPCSTR GetName(void) {return Name;}
-  LPCSTR GetCorrel(void) {return Correl;}
+  LPCSTR GetSrc(void) {return Srcdef;}
   LPCSTR GetCreator(void) {return Creator;}
   LPCSTR GetQualifier(void) {return Qualifier;}
   void   SetTo_Tdb(PTDB tdbp) {To_Tdb = tdbp;}
   void   SetName(LPCSTR name) {Name = name;}
-  void   SetCorrel(LPCSTR correl) {Correl = correl;}
+  void   SetSrc(LPCSTR srcdef) {Srcdef = srcdef;}
   void   SetCreator(LPCSTR crname) {Creator = crname;}
   void   SetQualifier(LPCSTR qname) {Qualifier = qname;}
 
@@ -44,8 +44,8 @@ class DllExport XTAB: public BLOCK {  // Table Name-Owner-Correl block.
   // Members
   PTABLE    Next;              // Points to next table in chain
   PTDB      To_Tdb;            // Points to Table description Block
-  LPCSTR    Name;              // Table name (can be changed by LNA and PLG)
-  LPCSTR    Correl;            // Correlation name
+  LPCSTR    Name;              // Table name
+  LPCSTR    Srcdef;            // Table Source definition
   LPCSTR    Creator;           // Creator name
   LPCSTR    Qualifier;         // Qualifier name
   }; // end of class XTAB