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.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-06-14 22:10:50 +02:00
parent 772c5f3c78 1135244a64
commit f66d1850ac
86 changed files with 2305 additions and 2514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_explain.cc
View File

@ -1782,7 +1782,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)
@ -2422,7 +2422,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)
@ -2451,7 +2451,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 */