Commit 7d439334 authored by Olivier Bertrand's avatar Olivier Bertrand

Fix failed compile modified storage/connect/ha_connect.cc and mycat.cc

parent 4e8af8a6
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
#define JSONMAX 10 // JSON Default max grp size #define JSONMAX 10 // JSON Default max grp size
extern "C" { extern "C" {
char version[]= "Version 1.07.0002 November 30, 2020"; char version[]= "Version 1.07.0002 December 01, 2020";
#if defined(__WIN__) #if defined(__WIN__)
char compver[]= "Version 1.07.0002 " __DATE__ " " __TIME__; char compver[]= "Version 1.07.0002 " __DATE__ " " __TIME__;
char slash= '\\'; char slash= '\\';
...@@ -4516,7 +4516,7 @@ bool ha_connect::check_privileges(THD *thd, PTOS options, char *dbn, bool quick) ...@@ -4516,7 +4516,7 @@ bool ha_connect::check_privileges(THD *thd, PTOS options, char *dbn, bool quick)
case TAB_VEC: case TAB_VEC:
case TAB_REST: case TAB_REST:
case TAB_JSON: case TAB_JSON:
#if defined DEVELOPMENT #if defined(DEVELOPMENT)
case TAB_BSON: case TAB_BSON:
#endif // DEVELOPMENT #endif // DEVELOPMENT
if (options->filename && *options->filename) { if (options->filename && *options->filename) {
...@@ -5685,9 +5685,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd, ...@@ -5685,9 +5685,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
} else if (topt->http) { } else if (topt->http) {
switch (ttp) { switch (ttp) {
case TAB_JSON: case TAB_JSON:
#ifdef DEVELOPMENT #if defined(DEVELOPMENT)
case TAB_BSON: case TAB_BSON:
#endif // DEVELOPMENT #endif // DEVELOPMENT
case TAB_XML: case TAB_XML:
case TAB_CSV: case TAB_CSV:
ttp = TAB_REST; ttp = TAB_REST;
...@@ -5872,9 +5872,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd, ...@@ -5872,9 +5872,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
case TAB_XML: case TAB_XML:
#endif // LIBXML2_SUPPORT || DOMDOC_SUPPORT #endif // LIBXML2_SUPPORT || DOMDOC_SUPPORT
case TAB_JSON: case TAB_JSON:
#ifdef DEVELOPMENT #if defined(DEVELOPMENT)
case TAB_BSON: case TAB_BSON:
#endif // DEVELOPMENT #endif // DEVELOPMENT
dsn= strz(g, create_info->connect_string); dsn= strz(g, create_info->connect_string);
if (!fn && !zfn && !mul && !dsn) if (!fn && !zfn && !mul && !dsn)
...@@ -6041,11 +6041,11 @@ static int connect_assisted_discovery(handlerton *, THD* thd, ...@@ -6041,11 +6041,11 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
case TAB_JSON: case TAB_JSON:
qrp= JSONColumns(g, db, dsn, topt, fnc == FNC_COL); qrp= JSONColumns(g, db, dsn, topt, fnc == FNC_COL);
break; break;
#ifdef DEVELOPMENT #if defined(DEVELOPMENT)
case TAB_BSON: case TAB_BSON:
qrp= BSONColumns(g, db, dsn, topt, fnc == FNC_COL); qrp= BSONColumns(g, db, dsn, topt, fnc == FNC_COL);
break; break;
#endif // DEVELOPMENT #endif // DEVELOPMENT
#if defined(JAVA_SUPPORT) #if defined(JAVA_SUPPORT)
case TAB_MONGO: case TAB_MONGO:
url= strz(g, create_info->connect_string); url= strz(g, create_info->connect_string);
......
...@@ -190,7 +190,7 @@ bool IsFileType(TABTYPE type) ...@@ -190,7 +190,7 @@ bool IsFileType(TABTYPE type)
case TAB_JSON: case TAB_JSON:
#if defined(DEVELOPMENT) #if defined(DEVELOPMENT)
case TAB_BSON: case TAB_BSON:
#endif #endif // DEVELOPMENT
case TAB_REST: case TAB_REST:
// case TAB_ZIP: // case TAB_ZIP:
isfile= true; isfile= true;
...@@ -288,7 +288,7 @@ bool IsTypeIndexable(TABTYPE type) ...@@ -288,7 +288,7 @@ bool IsTypeIndexable(TABTYPE type)
case TAB_JSON: case TAB_JSON:
#if defined(DEVELOPMENT) #if defined(DEVELOPMENT)
case TAB_BSON: case TAB_BSON:
#endif #endif // DEVELOPMENT
idx= true; idx= true;
break; break;
default: default:
...@@ -317,7 +317,7 @@ int GetIndexType(TABTYPE type) ...@@ -317,7 +317,7 @@ int GetIndexType(TABTYPE type)
case TAB_JSON: case TAB_JSON:
#if defined(DEVELOPMENT) #if defined(DEVELOPMENT)
case TAB_BSON: case TAB_BSON:
#endif #endif // DEVELOPMENT
xtyp= 1; xtyp= 1;
break; break;
case TAB_MYSQL: case TAB_MYSQL:
...@@ -484,7 +484,7 @@ PTABDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am) ...@@ -484,7 +484,7 @@ PTABDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am)
case TAB_JSON: tdp= new(g) JSONDEF; break; case TAB_JSON: tdp= new(g) JSONDEF; break;
#if defined(DEVELOPMENT) #if defined(DEVELOPMENT)
case TAB_BSON: tdp= new(g) BSONDEF; break; case TAB_BSON: tdp= new(g) BSONDEF; break;
#endif #endif // DEVELOPMENT
#if defined(ZIP_SUPPORT) #if defined(ZIP_SUPPORT)
case TAB_ZIP: tdp= new(g) ZIPDEF; break; case TAB_ZIP: tdp= new(g) ZIPDEF; break;
#endif // ZIP_SUPPORT #endif // ZIP_SUPPORT
......
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