summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2014-08-09 01:52:54 +0400
committerSergei Petrunia <psergey@askmonty.org>2014-08-09 01:52:54 +0400
commit83f0ddc6294ea8d4e424a540a043bf88ee4a8c8d (patch)
tree04280aba1544710aac2a6971a8d86a41c11cbecc /sql/sql_class.h
parentd87ffeb49133aa459e134f09924cd7b7b5013632 (diff)
parent5cfd3270ec79238b27765af3062ae7d97f6f06d0 (diff)
downloadmariadb-git-83f0ddc6294ea8d4e424a540a043bf88ee4a8c8d.tar.gz
Merge 10.1 (with ANALYZE) and 10.1-explain-json
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index f3537086132..c0636349b89 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3060,6 +3060,7 @@ public:
CHANGED_TABLE_LIST * changed_table_dup(const char *key, long key_length);
int send_explain_fields(select_result *result);
void make_explain_field_list(List<Item> &field_list);
+ 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