diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-12 22:54:46 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-12 22:54:46 +0200 |
| commit | 5b65d61d9384a45ea1b8df79694493fbb1a14e4a (patch) | |
| tree | 451255aa141e115baf97b867fb0752b8ce4dd9a9 /sql/sql_explain.cc | |
| parent | 56c60b2fc5d006206f54b93be401570837f2f312 (diff) | |
| parent | 7a7d9904e12335ee8b1eea9671138b3c469a3829 (diff) | |
| download | mariadb-git-5b65d61d9384a45ea1b8df79694493fbb1a14e4a.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_explain.cc')
| -rw-r--r-- | sql/sql_explain.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc index c8576136069..2fa4b2cb3ae 100644 --- a/sql/sql_explain.cc +++ b/sql/sql_explain.cc @@ -1223,7 +1223,7 @@ int Explain_table_access::print_explain(select_result_sink *output, uint8 explai if (rows_set) { item_list.push_back(new (mem_root) - Item_int(thd, (longlong) (ulonglong) rows, + Item_int(thd, (ulonglong) rows, MY_INT64_NUM_DECIMAL_DIGITS), mem_root); } @@ -1601,7 +1601,7 @@ void Explain_table_access::print_explain_json(Explain_query *query, /* `rows` */ if (rows_set) - writer->add_member("rows").add_ll(rows); + writer->add_member("rows").add_ull(rows); /* `r_rows` */ if (is_analyze) @@ -2239,7 +2239,7 @@ void Explain_update::print_explain_json(Explain_query *query, } /* `rows` */ - writer->add_member("rows").add_ll(rows); + writer->add_member("rows").add_ull(rows); if (mrr_type.length() != 0) @@ -2268,7 +2268,7 @@ void Explain_update::print_explain_json(Explain_query *query, r_rows= 0; r_filtered= buf_tracker.get_filtered_after_where() * 100.0; } - writer->add_member("r_rows").add_ll(r_rows); + writer->add_member("r_rows").add_ull(r_rows); writer->add_member("r_filtered").add_double(r_filtered); } else /* Not doing buffering */ |