- Add the "skipcol" option to Pivot tables.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h

1 files changed, 8 insertions, 6 deletions

diff --git a/storage/connect/tabpivot.h b/storage/connect/tabpivot.h
index 0b5bf50d13b..c7248ee2e1d 100644
--- a/storage/connect/tabpivot.h
+++ b/storage/connect/tabpivot.h
@@ -18,12 +18,13 @@ class PIVAID : public CSORT {
   friend class SRCCOL;
  public:
   // Constructor
-  PIVAID(const char *tab,   const char *src,  const char *picol,
-         const char *fncol, const char *host, const char *db,
-         const char *user,  const char *pwd,  int port);
+  PIVAID(const char *tab,   const char *src,   const char *picol,
+         const char *fncol, const char *skcol, const char *host, 
+         const char *db,    const char *user,  const char *pwd,  int port);
 
   // Methods
   PQRYRES MakePivotColumns(PGLOBAL g);
+  bool    SkipColumn(PCOLRES crp, char *skc);
 
   // The sorting function
   virtual int  Qcompare(int *, int *);
@@ -40,6 +41,7 @@ class PIVAID : public CSORT {
   char   *Tabsrc;                   // SQL of source table
   char   *Picol;                    // Pivot column name
   char   *Fncol;                    // Function column name
+  char   *Skcol;                    // Skipped columns
   PVBLK   Rblkp;                    // The value block of the pivot column
   int     Port;                     // MySQL port number
   }; // end of class PIVAID
@@ -191,6 +193,6 @@ class SRCCOL : public PRXCOL {
 
 PQRYRES PivotColumns(PGLOBAL g, const char *tab,   const char *src,
                                 const char *picol, const char *fncol,
-                                const char *host,  const char *db,   
-                                const char *user,  const char *pwd,  
-                                int port);
+                                const char *skcol, const char *host,
+                                const char *db,    const char *user,
+                                const char *pwd,   int port);