diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-06 21:33:52 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-06 21:33:52 +0200 |
| commit | d66d149f0a24f5c5f326fd3bca4ac91fa938b830 (patch) | |
| tree | 2164299e44fa52337ca1dc9e61961d88d368050b /storage/connect/mycat.cc | |
| parent | bae30c93da9531ecc9e1fd84b5808a658aac4fb1 (diff) | |
| download | mariadb-git-d66d149f0a24f5c5f326fd3bca4ac91fa938b830.tar.gz | |
Make source the same as branch 10.2
Diffstat (limited to 'storage/connect/mycat.cc')
| -rw-r--r-- | storage/connect/mycat.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 0104213ed92..23005db5272 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -1,4 +1,4 @@ -/* Copyright (C) Olivier Bertrand 2004 - 2017 +/* Copyright (C) MariaDB Corporation Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -86,7 +86,7 @@ #if defined(JDBC_SUPPORT) #define NJDBC #include "tabjdbc.h" -#endif // ODBC_SUPPORT +#endif // JDBC_SUPPORT #if defined(PIVOT_SUPPORT) #include "tabpivot.h" #endif // PIVOT_SUPPORT @@ -97,7 +97,7 @@ #include "tabxml.h" #endif // XML_SUPPORT #if defined(MONGO_SUPPORT) -#include "tabmgo.h" +#include "mongo.h" #endif // MONGO_SUPPORT #if defined(ZIP_SUPPORT) #include "tabzip.h" @@ -133,21 +133,21 @@ TABTYPE GetTypeID(const char *type) : (!stricmp(type, "CSV")) ? TAB_CSV : (!stricmp(type, "FMT")) ? TAB_FMT : (!stricmp(type, "DBF")) ? TAB_DBF -#ifdef XML_SUPPORT +#if defined(XML_SUPPORT) : (!stricmp(type, "XML")) ? TAB_XML #endif : (!stricmp(type, "INI")) ? TAB_INI : (!stricmp(type, "VEC")) ? TAB_VEC -#ifdef ODBC_SUPPORT +#if defined(ODBC_SUPPORT) : (!stricmp(type, "ODBC")) ? TAB_ODBC #endif -#ifdef JDBC_SUPPORT +#if defined(JDBC_SUPPORT) : (!stricmp(type, "JDBC")) ? TAB_JDBC #endif : (!stricmp(type, "MYSQL")) ? TAB_MYSQL : (!stricmp(type, "MYPRX")) ? TAB_MYSQL : (!stricmp(type, "DIR")) ? TAB_DIR -#ifdef __WIN__ +#if defined(__WIN__) : (!stricmp(type, "MAC")) ? TAB_MAC : (!stricmp(type, "WMI")) ? TAB_WMI #endif @@ -156,15 +156,15 @@ TABTYPE GetTypeID(const char *type) : (!stricmp(type, "OCCUR")) ? TAB_OCCUR : (!stricmp(type, "CATLG")) ? TAB_PRX // Legacy : (!stricmp(type, "PROXY")) ? TAB_PRX -#ifdef PIVOT_SUPPORT +#if defined(PIVOT_SUPPORT) : (!stricmp(type, "PIVOT")) ? TAB_PIVOT #endif : (!stricmp(type, "VIR")) ? TAB_VIR : (!stricmp(type, "JSON")) ? TAB_JSON -#ifdef ZIP_SUPPORT +#if defined(ZIP_SUPPORT) : (!stricmp(type, "ZIP")) ? TAB_ZIP #endif -#ifdef MONGO_SUPPORT +#if defined(MONGO_SUPPORT) : (!stricmp(type, "MONGO")) ? TAB_MONGO #endif : (!stricmp(type, "OEM")) ? TAB_OEM : TAB_NIY; |