diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-30 10:57:00 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-01-30 10:57:00 +0100 |
| commit | fd1ca70bb3710ae280bd11b3650820dd62002419 (patch) | |
| tree | 4bf2d015e61dc83733c146a7cca4025ead296bde /storage/connect/json.h | |
| parent | 9a2dc7dfed6b56c529b2de865a15929bee2eceaf (diff) | |
| download | mariadb-git-fd1ca70bb3710ae280bd11b3650820dd62002419.tar.gz | |
- Enhance JSON tables handling.
modified:
storage/connect/json.cpp
storage/connect/json.h
storage/connect/mysql-test/connect/r/json.result
storage/connect/mysql-test/connect/t/json.test
storage/connect/tabjson.cpp
storage/connect/tabjson.h
- Avoid crash when a partition table name pattern is ill formed
(such as using place holder %i instead of %s)
modified:
storage/connect/ha_connect.cc
Diffstat (limited to 'storage/connect/json.h')
| -rw-r--r-- | storage/connect/json.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/json.h b/storage/connect/json.h index f0748108dd6..7f16ccf025a 100644 --- a/storage/connect/json.h +++ b/storage/connect/json.h @@ -18,7 +18,8 @@ enum JTYP {TYPE_STRG = 1, TYPE_BOOL = 4,
TYPE_INTG = 7,
TYPE_JSON = 12,
- TYPE_JAR, TYPE_JOB,
+ TYPE_JAR,
+ TYPE_JOB,
TYPE_JVAL};
class JOUT;
|