diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2014-11-27 00:51:54 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2014-11-27 00:51:54 +0300 |
| commit | 3d5f97fd708e12201636179baee2c8bc0093c109 (patch) | |
| tree | 04a2ea21f8312ecc4100e179f32ce58e719e82fb /sql/sql_class.h | |
| parent | 55e99b29339dae833448ded6d0ca3d31f673d02a (diff) | |
| parent | 3c5ce8a0a32a74cd8e0ddc81bcfacf7c85f0d90a (diff) | |
| download | mariadb-git-3d5f97fd708e12201636179baee2c8bc0093c109.tar.gz | |
Merge ../10.1-explain-json-r4 into 10.1
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7a34960e390..51fd1cb010c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3087,6 +3087,8 @@ public: bool is_analyze); void make_explain_field_list(List<Item> &field_list, uint8 explain_flags, bool is_analyze); + void make_explain_json_field_list(List<Item> &field_list); + /** Clear the current error, if any. We do not clear is_fatal_error or is_fatal_sub_stmt_error since we |