summaryrefslogtreecommitdiff
path: root/storage/connect/taboccur.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-04-17 20:05:41 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2015-04-17 20:05:41 +0200
commiteae8318b19da168e4676fe3da5b2f8665cb4104c (patch)
tree36e1fa5fe72d8c72d2876f5c47838d7b406ff0fa /storage/connect/taboccur.cpp
parent05b30fbcc38cdc5dcd248f9b8385a9fec65f2d96 (diff)
downloadmariadb-git-eae8318b19da168e4676fe3da5b2f8665cb4104c.tar.gz
- Fix Catalog JSON table crash when no Jpath
- Added JSON OBJECT specification for pretty != 2. - Fix NULL values not recognized for nullable JSON columns - Issue an error message when a JSON table is created without specifying LRECL if PRETTY != 2. - Make JSONColumns use a TDBJSON class. - Make JSON table using MAPFAM modified: filamap.h filamtxt.h ha_connect.cc json.result tabjson.cpp tabjson.h table.cpp - Implementing Discovery for the XML table type. modified: domdoc.cpp domdoc.h ha_connect.cc libdoc.cpp plgxml.cpp plgxml.h reldef.cpp reldef.h tabxml.cpp tabxml.h - Providing an error message when creating an ODBC table via discovery returns columns of more than one table. modified: ha_connect.cc - TableOptionStruct declaration moved from ha_connect.h to mycat.h To make it easier to use by other classes. modified: ha_connect.cc ha_connect.h mycat.cc mycat.h reldef.cpp tabmysql.cpp taboccur.cpp tabpivot.cpp tabtbl.cpp tabutil.cpp tabxcl.cpp
Diffstat (limited to 'storage/connect/taboccur.cpp')
-rw-r--r--storage/connect/taboccur.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/connect/taboccur.cpp b/storage/connect/taboccur.cpp
index 5ef0ee52653..7f7b1c5d50c 100644
--- a/storage/connect/taboccur.cpp
+++ b/storage/connect/taboccur.cpp
@@ -47,7 +47,6 @@
#include "xtable.h"
#include "tabmysql.h"
#include "ha_connect.h"
-#include "mycat.h"
/***********************************************************************/
/* Prepare and count columns in the column list. */