Commit a3c4f872 authored by Alexander Barkov's avatar Alexander Barkov

Fixing warnings:

- no previous declaration for ‘bool OcrSrcCol'
- no previous declaration for ‘bool OcrColumns'
- no previous declaration for ‘_qryres* PivotColumns'

modified:
  storage/connect/ha_connect.cc
  storage/connect/taboccur.h
  storage/connect/tabpivot.h
parent c5b631ce
...@@ -149,6 +149,10 @@ ...@@ -149,6 +149,10 @@
#include "libdoc.h" #include "libdoc.h"
#endif // LIBXML2_SUPPORT #endif // LIBXML2_SUPPORT
#include "taboccur.h"
#include "tabpivot.h"
/***********************************************************************/ /***********************************************************************/
/* DB static variables. */ /* DB static variables. */
/***********************************************************************/ /***********************************************************************/
...@@ -166,16 +170,6 @@ extern "C" { ...@@ -166,16 +170,6 @@ extern "C" {
int trace= 0; // The general trace value int trace= 0; // The general trace value
} // extern "C" } // extern "C"
bool OcrColumns(PGLOBAL g, PQRYRES qrp, const char *col,
const char *ocr, const char *rank);
bool OcrSrcCols(PGLOBAL g, PQRYRES qrp, const char *col,
const char *ocr, const char *rank);
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);
/****************************************************************************/ /****************************************************************************/
/* Initialize the ha_connect static members. */ /* Initialize the ha_connect static members. */
/****************************************************************************/ /****************************************************************************/
......
...@@ -137,3 +137,9 @@ class XCOLDEF: public COLDEF { ...@@ -137,3 +137,9 @@ class XCOLDEF: public COLDEF {
friend class TDBOCCUR; friend class TDBOCCUR;
}; // end of class XCOLDEF }; // end of class XCOLDEF
bool OcrColumns(PGLOBAL g, PQRYRES qrp, const char *col,
const char *ocr, const char *rank);
bool OcrSrcCols(PGLOBAL g, PQRYRES qrp, const char *col,
const char *ocr, const char *rank);
...@@ -188,3 +188,9 @@ class SRCCOL : public PRXCOL { ...@@ -188,3 +188,9 @@ class SRCCOL : public PRXCOL {
// Members // Members
}; // end of class SRCCOL }; // end of class SRCCOL
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);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment