connect fixes after-merge
disable Mongo in 10.0, compiler warnings.
This commit is contained in:
parent
d3976cf72a
commit
8f3fd98d25
@ -247,7 +247,7 @@ ENDIF(CONNECT_WITH_ODBC)
|
||||
#
|
||||
# JDBC with MongoDB Java Driver included but disabled
|
||||
#
|
||||
OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON)
|
||||
#OPTION(CONNECT_WITH_MONGO "Compile CONNECT storage engine with MONGO support" ON)
|
||||
OPTION(CONNECT_WITH_JDBC "Compile CONNECT storage engine with JDBC support" ON)
|
||||
|
||||
IF(CONNECT_WITH_JDBC)
|
||||
|
@ -8,7 +8,7 @@
|
||||
/***********************************************************************/
|
||||
typedef struct _datpar {
|
||||
const char *Format; // Points to format to decode
|
||||
char *Curp; // Points to current parsing position
|
||||
const char *Curp; // Points to current parsing position
|
||||
char *InFmt; // Start of input format
|
||||
char *OutFmt; // Start of output format
|
||||
int Index[8]; // Indexes of date values
|
||||
|
@ -135,7 +135,7 @@ class TDBMYSQL : public TDBEXT {
|
||||
int m_Rc; // Return code from command
|
||||
//int AftRows; // The number of affected rows
|
||||
int N; // The current table index
|
||||
int Port; // MySQL port number (0 = default)
|
||||
unsigned Port; // MySQL port number (0 = default)
|
||||
//int Nparm; // The number of statement parameters
|
||||
//int Quoted; // The identifier quoting level
|
||||
}; // end of class TDBMYSQL
|
||||
|
@ -120,7 +120,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
|
||||
FLD_REM, FLD_NO, FLD_CHARSET};
|
||||
unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 32, 32};
|
||||
PCSZ fmt;
|
||||
char *pn, *tn, *fld, *colname, *chset, v;
|
||||
char *pn, *tn, *fld, *colname, v; //, *chset;
|
||||
int i, n, ncol = sizeof(buftyp) / sizeof(int);
|
||||
int prec, len, type, scale;
|
||||
int zconv = GetConvSize();
|
||||
@ -185,7 +185,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
|
||||
colname = (char *)fp->field_name;
|
||||
crp->Kdata->SetValue(colname, i);
|
||||
|
||||
chset = (char *)fp->charset()->name;
|
||||
// chset = (char *)fp->charset()->name;
|
||||
// v = (!strcmp(chset, "binary")) ? 'B' : 0;
|
||||
v = 0;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user