summaryrefslogtreecommitdiff
path: root/sql/sql_explain.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-10-10 20:30:32 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-10-10 20:30:32 +0400
commit094f70fd1908c17c0ebc4b6942e3bebed0a236ba (patch)
tree4058348c37c0ec18249690e111a9cb1a13c55b16 /sql/sql_explain.cc
parent582ecb2a253ed2c9e26a2e61102da4bf4ede72d3 (diff)
downloadmariadb-git-094f70fd1908c17c0ebc4b6942e3bebed0a236ba.tar.gz
MDEV-5106: Server crashes in Explain_union::print_explain on ER_TOO_BIG_SELECT
- Don't save UNION's EXPLAIN data if optimization failed with an error. We could end up saving incomplete plan, which will cause a crash when we attempt to print it.
Diffstat (limited to 'sql/sql_explain.cc')
-rw-r--r--sql/sql_explain.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
index 91a73cfb7d3..f8d544a52e9 100644
--- a/sql/sql_explain.cc
+++ b/sql/sql_explain.cc
@@ -157,6 +157,10 @@ bool print_explain_query(LEX *lex, THD *thd, String *str)
}
+/*
+ Return tabular EXPLAIN output as a text string
+*/
+
bool Explain_query::print_explain_str(THD *thd, String *out_str)
{
List<Item> fields;