diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
| commit | b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc (patch) | |
| tree | 4edd8565c6eb0b1139cbb37c48f4d5f5a28798be /sql/item_strfunc.h | |
| parent | f010c90807da68487b1ce4c952588c6c3def2afd (diff) | |
| parent | f72760df3390407c3cbe876e827818bc52849b71 (diff) | |
| download | mariadb-git-b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 29af0b43d9d..a458ff53d11 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1442,6 +1442,7 @@ public: (cs->state & MY_CS_UNICODE)); } } + bool is_json_type() { return args[0]->is_json_type(); } String *val_str(String *); longlong val_int() { |