summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorOleg Smirnov <olernov@gmail.com>2022-01-11 20:25:11 +0300
committerSergei Petrunia <sergey@mariadb.com>2022-04-29 10:47:03 +0300
commit328684833b3e6e8fad5a71a4c6aa1676cb6c6e37 (patch)
tree74982c279a4976aff3eff766d8deb37204994abf /sql/sql_lex.h
parent51b28b24ca3a33a3a9b2a844c6c8a94df1bad253 (diff)
downloadmariadb-git-328684833b3e6e8fad5a71a4c6aa1676cb6c6e37.tar.gz
MDEV-10000 Add EXPLAIN [FORMAT=JSON] FOR CONNECTION syntax support
EXPLAIN FOR CONNECTION is a MySQL-compatible syntax for SHOW EXPLAIN. This commit also adds support for FORMAT=JSON to SHOW EXPLAIN, so the possible options to get JSON-formatted output are: - SHOW EXPLAIN FORMAT=JSON FOR $con - EXPLAIN FORMAT=JSON FOR CONNECTION $con
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 4432abcaac8..ca8d22fd23a 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -3795,8 +3795,14 @@ public:
bool save_prep_leaf_tables();
int print_explain(select_result_sink *output, uint8 explain_flags,
+<<<<<<< HEAD
bool is_analyze, bool *printed_anything);
bool restore_set_statement_var();
+=======
+ bool is_analyze, bool is_json_format,
+ bool *printed_anything);
+ void restore_set_statement_var();
+>>>>>>> 54281b6e74e... MDEV-10000 Add EXPLAIN [FORMAT=JSON] FOR CONNECTION syntax support
void init_last_field(Column_definition *field, const LEX_CSTRING *name);
bool last_field_generated_always_as_row_start_or_end(Lex_ident *p,