diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-19 18:55:25 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-19 18:55:25 +0100 |
| commit | 2d2e110bcef08a772cae8e2ee7d226e2831f6459 (patch) | |
| tree | b0bb91ca673f4fee88b6a7a2e3bdecac4b52cd67 /storage/connect/plgdbsem.h | |
| parent | fb3f46967cfe4f3f28d13f5083a76b7c939e2724 (diff) | |
| download | mariadb-git-2d2e110bcef08a772cae8e2ee7d226e2831f6459.tar.gz | |
- Adding the JSON table type
added:
storage/connect/json.cpp
storage/connect/json.h
storage/connect/mysql-test/connect/r/json.result
storage/connect/mysql-test/connect/std_data/biblio.jsn
storage/connect/mysql-test/connect/std_data/expense.jsn
storage/connect/mysql-test/connect/std_data/mulexp3.jsn
storage/connect/mysql-test/connect/std_data/mulexp4.jsn
storage/connect/mysql-test/connect/std_data/mulexp5.jsn
storage/connect/mysql-test/connect/t/json.test
storage/connect/tabjson.cpp
storage/connect/tabjson.h
modified:
storage/connect/CMakeLists.txt
storage/connect/engmsg.h
storage/connect/filamtxt.h
storage/connect/ha_connect.cc
storage/connect/msgid.h
storage/connect/mycat.cc
storage/connect/plgdbsem.h
storage/connect/tabdos.cpp
storage/connect/value.cpp
storage/connect/value.h
Diffstat (limited to 'storage/connect/plgdbsem.h')
| -rw-r--r-- | storage/connect/plgdbsem.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/connect/plgdbsem.h b/storage/connect/plgdbsem.h index 24090e98804..e61a49ba9f9 100644 --- a/storage/connect/plgdbsem.h +++ b/storage/connect/plgdbsem.h @@ -74,11 +74,10 @@ enum TABTYPE {TAB_UNDEF = 0, /* Table of undefined type */ TAB_PLG = 20, /* PLG NIY */ TAB_PIVOT = 21, /* PIVOT table */ TAB_VIR = 22, /* Virtual tables */ -// TAB_JSON = 23, /* JSON tables */ -// TAB_JSN = 24, /* Semi-json tables */ - TAB_JCT = 25, /* Junction tables NIY */ - TAB_DMY = 26, /* DMY Dummy tables NIY */ - TAB_NIY = 27}; /* Table not implemented yet */ + TAB_JSON = 23, /* JSON tables */ + TAB_JCT = 24, /* Junction tables NIY */ + TAB_DMY = 25, /* DMY Dummy tables NIY */ + TAB_NIY = 26}; /* Table not implemented yet */ enum AMT {TYPE_AM_ERROR = 0, /* Type not defined */ TYPE_AM_ROWID = 1, /* ROWID type (special column) */ @@ -123,6 +122,8 @@ enum AMT {TYPE_AM_ERROR = 0, /* Type not defined */ TYPE_AM_BLK = 131, /* BLK access method type no */ TYPE_AM_ZIP = 132, /* ZIP access method type no */ TYPE_AM_ZLIB = 133, /* ZLIB access method type no */ + TYPE_AM_JSON = 134, /* JSON access method type no */ + TYPE_AM_JSN = 135, /* JSN access method type no */ TYPE_AM_MAC = 137, /* MAC table access method type */ TYPE_AM_WMI = 139, /* WMI table access method type */ TYPE_AM_XCL = 140, /* SYS column access method type */ |