diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2020-12-01 20:57:05 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2020-12-01 20:57:05 +0100 |
| commit | 7d439334fffcd9b44e524e3b8e3ef59009ebcac0 (patch) | |
| tree | c911fd31da30417a6b3e7f1826e4ba55908560d3 /storage | |
| parent | 4e8af8a6645136be34649abacb5b31ef64264584 (diff) | |
| download | mariadb-git-7d439334fffcd9b44e524e3b8e3ef59009ebcac0.tar.gz | |
Fix failed compile modified storage/connect/ha_connect.cc and mycat.cc
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/ha_connect.cc | 16 | ||||
| -rw-r--r-- | storage/connect/mycat.cc | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 4e7dd3ff394..fc67edc5330 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -170,7 +170,7 @@ #define JSONMAX 10 // JSON Default max grp size extern "C" { - char version[]= "Version 1.07.0002 November 30, 2020"; + char version[]= "Version 1.07.0002 December 01, 2020"; #if defined(__WIN__) char compver[]= "Version 1.07.0002 " __DATE__ " " __TIME__; char slash= '\\'; @@ -4516,7 +4516,7 @@ bool ha_connect::check_privileges(THD *thd, PTOS options, char *dbn, bool quick) case TAB_VEC: case TAB_REST: case TAB_JSON: -#if defined DEVELOPMENT +#if defined(DEVELOPMENT) case TAB_BSON: #endif // DEVELOPMENT if (options->filename && *options->filename) { @@ -5685,9 +5685,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd, } else if (topt->http) { switch (ttp) { case TAB_JSON: -#ifdef DEVELOPMENT +#if defined(DEVELOPMENT) case TAB_BSON: -#endif // DEVELOPMENT +#endif // DEVELOPMENT case TAB_XML: case TAB_CSV: ttp = TAB_REST; @@ -5872,9 +5872,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd, case TAB_XML: #endif // LIBXML2_SUPPORT || DOMDOC_SUPPORT case TAB_JSON: -#ifdef DEVELOPMENT +#if defined(DEVELOPMENT) case TAB_BSON: -#endif // DEVELOPMENT +#endif // DEVELOPMENT dsn= strz(g, create_info->connect_string); if (!fn && !zfn && !mul && !dsn) @@ -6041,11 +6041,11 @@ static int connect_assisted_discovery(handlerton *, THD* thd, case TAB_JSON: qrp= JSONColumns(g, db, dsn, topt, fnc == FNC_COL); break; -#ifdef DEVELOPMENT +#if defined(DEVELOPMENT) case TAB_BSON: qrp= BSONColumns(g, db, dsn, topt, fnc == FNC_COL); break; -#endif // DEVELOPMENT +#endif // DEVELOPMENT #if defined(JAVA_SUPPORT) case TAB_MONGO: url= strz(g, create_info->connect_string); diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 395e1192b45..476baf63039 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -190,7 +190,7 @@ bool IsFileType(TABTYPE type) case TAB_JSON: #if defined(DEVELOPMENT) case TAB_BSON: -#endif +#endif // DEVELOPMENT case TAB_REST: // case TAB_ZIP: isfile= true; @@ -288,7 +288,7 @@ bool IsTypeIndexable(TABTYPE type) case TAB_JSON: #if defined(DEVELOPMENT) case TAB_BSON: -#endif +#endif // DEVELOPMENT idx= true; break; default: @@ -317,7 +317,7 @@ int GetIndexType(TABTYPE type) case TAB_JSON: #if defined(DEVELOPMENT) case TAB_BSON: -#endif +#endif // DEVELOPMENT xtyp= 1; break; case TAB_MYSQL: @@ -484,7 +484,7 @@ PTABDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am) case TAB_JSON: tdp= new(g) JSONDEF; break; #if defined(DEVELOPMENT) case TAB_BSON: tdp= new(g) BSONDEF; break; -#endif +#endif // DEVELOPMENT #if defined(ZIP_SUPPORT) case TAB_ZIP: tdp= new(g) ZIPDEF; break; #endif // ZIP_SUPPORT |