diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
| commit | 29acdcd5427e13bc3aefbbeee17b42bfe23dea84 (patch) | |
| tree | f8f5365594c3b43e01891b7017f47fa6b934c646 /sql/sql_analyze_stmt.cc | |
| parent | e33bda183e80ff63a984ed2a938467950b23a3fd (diff) | |
| parent | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (diff) | |
| download | mariadb-git-MDEV-9804.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804
Conflicts:
VERSION
debian/mariadb-backup-10.2.files
debian/mariadb-backup-10.2.install
debian/mariadb-backup-10.3.files
mysql-test/unstable-tests
Diffstat (limited to 'sql/sql_analyze_stmt.cc')
| -rw-r--r-- | sql/sql_analyze_stmt.cc | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sql/sql_analyze_stmt.cc b/sql/sql_analyze_stmt.cc index cc6e0f89f75..ac3797aae60 100644 --- a/sql/sql_analyze_stmt.cc +++ b/sql/sql_analyze_stmt.cc @@ -26,7 +26,11 @@ void Filesort_tracker::print_json_members(Json_writer *writer) { const char *varied_str= "(varied across executions)"; - writer->add_member("r_loops").add_ll(get_r_loops()); + + if (!get_r_loops()) + writer->add_member("r_loops").add_null(); + else + writer->add_member("r_loops").add_ll(get_r_loops()); if (get_r_loops() && time_tracker.timed) { @@ -36,22 +40,29 @@ void Filesort_tracker::print_json_members(Json_writer *writer) if (r_limit != HA_POS_ERROR) { writer->add_member("r_limit"); - if (r_limit == 0) + if (!get_r_loops()) + writer->add_null(); + else if (r_limit == 0) writer->add_str(varied_str); else writer->add_ll((longlong) rint(r_limit/get_r_loops())); } writer->add_member("r_used_priority_queue"); - if (r_used_pq == get_r_loops()) + if (!get_r_loops()) + writer->add_null(); + else if (r_used_pq == get_r_loops()) writer->add_bool(true); else if (r_used_pq == 0) writer->add_bool(false); else writer->add_str(varied_str); - writer->add_member("r_output_rows").add_ll((longlong) rint(r_output_rows / - get_r_loops())); + if (!get_r_loops()) + writer->add_member("r_output_rows").add_null(); + else + writer->add_member("r_output_rows").add_ll((longlong) rint(r_output_rows / + get_r_loops())); if (sort_passes) { |