mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typos in JSON MRR output

Browse source
This commit is contained in:
Sergei Petrunia 2015-09-24 16:31:45 +03:00
parent 7016621596
commit 125001881d
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/explain_json.result
View file

@ -1492,7 +1492,7 @@ EXPLAIN
"buffer_type": "flat", "buffer_type": "flat",
"buffer_size": "256Kb", "buffer_size": "256Kb",
"join_type": "BKA", "join_type": "BKA",
"mrr_type": "; Rowid-ordered scan" "mrr_type": "Rowid-ordered scan"
} }
} }
} }
@ -1535,7 +1535,7 @@ ANALYZE
"buffer_type": "flat", "buffer_type": "flat",
"buffer_size": "256Kb", "buffer_size": "256Kb",
"join_type": "BKA", "join_type": "BKA",
"mrr_type": "; Rowid-ordered scan", "mrr_type": "Rowid-ordered scan",
"r_filtered": 100 "r_filtered": 100
} }
} }

3
sql/sql_explain.cc
View file

@ -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(" join"));
str->append(STRING_WITH_LEN(")")); str->append(STRING_WITH_LEN(")"));
if (bka_type.mrr_type.length()) if (bka_type.mrr_type.length())
{
str->append(STRING_WITH_LEN("; "));
str->append(bka_type.mrr_type); str->append(bka_type.mrr_type);
}
break; break;
} }

1
sql/sql_join_cache.cc
View file

@ -2620,6 +2620,7 @@ static void add_mrr_explain_info(String *str, uint mrr_mode, handler *file)
sizeof(mrr_str_buf)); sizeof(mrr_str_buf));
if (len > 0) if (len > 0)
{ {
if (str->length())
str->append(STRING_WITH_LEN("; ")); str->append(STRING_WITH_LEN("; "));
str->append(mrr_str_buf, len); str->append(mrr_str_buf, len);
} }