summaryrefslogtreecommitdiff
path: root/storage/connect/mycat.cc
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-05-10 20:22:21 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2013-05-10 20:22:21 +0200
commit99d95c8a2fec8037738a4c700a163b206f9ab4c8 (patch)
treeeeeaad356e4ac73bec038e33f44b33966abb0da4 /storage/connect/mycat.cc
parentbe268bed3d893ef053ff35a4900cc1c125bb5769 (diff)
downloadmariadb-git-99d95c8a2fec8037738a4c700a163b206f9ab4c8.tar.gz
- Added table type PIVOT
modified: storage/connect/filamdbf.cpp storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/mycat.cc storage/connect/myconn.cpp storage/connect/odbconn.cpp storage/connect/plgcnx.h storage/connect/plgdbsem.h storage/connect/plgdbutl.cpp storage/connect/tabfmt.cpp storage/connect/tabpivot.cpp storage/connect/tabpivot.h storage/connect/tabutil.cpp storage/connect/tabwmi.cpp storage/connect/tabxcl.cpp storage/connect/value.cpp storage/connect/value.h
Diffstat (limited to 'storage/connect/mycat.cc')
-rw-r--r--storage/connect/mycat.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc
index badcdcb9514..7b7f79d7b58 100644
--- a/storage/connect/mycat.cc
+++ b/storage/connect/mycat.cc
@@ -132,6 +132,9 @@ TABTYPE GetTypeID(const char *type)
: (!stricmp(type, "OCCUR")) ? TAB_OCCUR
: (!stricmp(type, "CATLG")) ? TAB_PRX // Legacy
: (!stricmp(type, "PROXY")) ? TAB_PRX
+#ifdef PIVOT_SUPPORT
+ : (!stricmp(type, "PIVOT")) ? TAB_PIVOT
+#endif
: (!stricmp(type, "OEM")) ? TAB_OEM : TAB_NIY;
} // end of GetTypeID
@@ -650,9 +653,9 @@ PRELDEF MYCAT::MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am)
#if defined(MYSQL_SUPPORT)
case TAB_MYSQL: tdp= new(g) MYSQLDEF; break;
#endif // MYSQL_SUPPORT
-//#if defined(PIVOT_SUPPORT)
-// case TAB_PIVOT: tdp= new(g) PIVOTDEF; break;
-//#endif // PIVOT_SUPPORT
+#if defined(PIVOT_SUPPORT)
+ case TAB_PIVOT: tdp= new(g) PIVOTDEF; break;
+#endif // PIVOT_SUPPORT
default:
sprintf(g->Message, MSG(BAD_TABLE_TYPE), am, name);
} // endswitch