summaryrefslogtreecommitdiff
path: root/sql/sql_explain.cc
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2015-04-15 12:09:25 -0700
committerSergei Petrunia <psergey@askmonty.org>2015-04-15 12:09:25 -0700
commitc712b376d8189b963851db86a0bedd478aab869e (patch)
tree8d02a74357f8ba77261d79bd70ca6174e0fe5dd8 /sql/sql_explain.cc
parent25da74ce3f17a4720f4f7f06b1d694ff417d6b60 (diff)
parentd051f6c36beaf6c7ea269d6c174cca7482f3e823 (diff)
downloadmariadb-git-bb-10.1-explain-analyze.tar.gz
Merge branch '10.1' into bb-10.1-explain-analyzebb-10.1-explain-analyze
Diffstat (limited to 'sql/sql_explain.cc')
-rw-r--r--sql/sql_explain.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
index 09ae696e78f..ccd23b8e57c 100644
--- a/sql/sql_explain.cc
+++ b/sql/sql_explain.cc
@@ -769,7 +769,7 @@ void Explain_select::print_explain_json(Explain_query *query,
write_item(writer, exec_const_cond);
}
- Filesort_tracker *first_table_sort= false;
+ Filesort_tracker *first_table_sort= NULL;
int started_objects= 0;
if (is_analyze)