diff options
author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-26 20:47:08 +0300 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-26 20:47:08 +0300 |
commit | c6d29cd30db9053023124bf74f17f6ee9d8e168d (patch) | |
tree | a3f90d99d29655c249a8437b421523309cb473fb /sql/sql_explain.cc | |
parent | 3e5994868de68f5112e5faf63188e4f53050afd5 (diff) | |
parent | be885ebe8c3df78d090c2ad25772959fc2ae9fc9 (diff) | |
download | mariadb-git-c6d29cd30db9053023124bf74f17f6ee9d8e168d.tar.gz |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Diffstat (limited to 'sql/sql_explain.cc')
-rw-r--r-- | sql/sql_explain.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc index af51c5fc382..9df4fd965a5 100644 --- a/sql/sql_explain.cc +++ b/sql/sql_explain.cc @@ -957,7 +957,8 @@ int Explain_update::print_explain(Explain_query *query, Single-table DELETE commands do not do "Using temporary". "Using index condition" is also not possible (which is an unjustified limitation) */ - double r_filtered= 100 * (r_rows?((double)r_rows_after_where/r_rows):1.0); + double r_filtered= 100 * tracker.get_filtered_after_where(); + ha_rows r_rows= tracker.get_avg_rows(); print_explain_row(output, explain_flags, is_analyze, 1, /* id */ @@ -970,7 +971,7 @@ int Explain_update::print_explain(Explain_query *query, key_len_buf.length() ? key_len_buf.c_ptr() : NULL, NULL, /* 'ref' is always NULL in single-table EXPLAIN DELETE */ &rows, - &r_rows, + tracker.has_scans()? &r_rows : NULL, r_filtered, extra_str.c_ptr_safe()); |