database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-06-13 16:42:21 +02:00
parent e9145aab44 5b65d61d93
commit 50653e021f
36 changed files with 783 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_explain.cc
View File

@ -1230,7 +1230,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);
}
@ -1605,7 +1605,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)
@ -2243,7 +2243,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)
@ -2272,7 +2272,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 */