summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2015-09-24 16:31:45 +0300
committerSergei Petrunia <psergey@askmonty.org>2015-09-24 16:31:45 +0300
commit125001881dac9425e9aee12bd64003ee0b220580 (patch)
tree24f72fc0334be8eddd2f0885696be3815c8eb7e2 /sql
parent7016621596d4700a8cf2c228f958edf8d8932d38 (diff)
downloadmariadb-git-125001881dac9425e9aee12bd64003ee0b220580.tar.gz
Fix typos in JSON MRR output
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_explain.cc3
-rw-r--r--sql/sql_join_cache.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
index ba035ab2343..336315831b2 100644
--- a/sql/sql_explain.cc
+++ b/sql/sql_explain.cc
@@ -1809,7 +1809,10 @@ void Explain_table_access::append_tag_name(String *str, enum explain_extra_tag t
str->append(STRING_WITH_LEN(" join"));
str->append(STRING_WITH_LEN(")"));
if (bka_type.mrr_type.length())
+ {
+ str->append(STRING_WITH_LEN("; "));
str->append(bka_type.mrr_type);
+ }
break;
}
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index 731cc7267d5..f84440afa90 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -2620,7 +2620,8 @@ static void add_mrr_explain_info(String *str, uint mrr_mode, handler *file)
sizeof(mrr_str_buf));
if (len > 0)
{
- str->append(STRING_WITH_LEN("; "));
+ if (str->length())
+ str->append(STRING_WITH_LEN("; "));
str->append(mrr_str_buf, len);
}
}