fixup MDEV-18478 ANALYZE for statement part#2

vuvova · vuvova · commit d40b3aa6666a · 2024-03-17T17:18:53.000+01:00
Error:Run-Time Check Failure #3 - The variable 'r_filtered' is being used without being initialized. At :0
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
@@ -2167,10 +2167,7 @@ void Explain_table_access::print_explain_json(Explain_query *query,
         r_filtered= tracker.get_filtered_after_where()*100.0;
       }
     }
-  }
 
-  if (is_analyze)
-  {
     /*
       Add r_total_filtered, as combined "filtered" of all kinds of filtering:
       Rowid Filter, Index Condition Pushdown, attached condition.
@@ -2186,7 +2183,7 @@ void Explain_table_access::print_explain_json(Explain_query *query,
 
       r_total_filtered= out_rows* 100.0 / r_index_rows;
     }
-    else
+    else if (have_r_filtered)
       r_total_filtered= r_filtered;
 
     writer->add_member("r_total_filtered");

Original file line number	Diff line number	Diff line change
`@@ -2167,10 +2167,7 @@ void Explain_table_access::print_explain_json(Explain_query *query,`
`2167`	`2167`	`r_filtered= tracker.get_filtered_after_where()*100.0;`
`2168`	`2168`	`}`
`2169`	`2169`	`}`
`2170`		`- }`
`2171`	`2170`
`2172`		`- if (is_analyze)`
`2173`		`- {`
`2174`	`2171`	`/*`
`2175`	`2172`	`Add r_total_filtered, as combined "filtered" of all kinds of filtering:`
`2176`	`2173`	`Rowid Filter, Index Condition Pushdown, attached condition.`
`@@ -2186,7 +2183,7 @@ void Explain_table_access::print_explain_json(Explain_query *query,`
`2186`	`2183`
`2187`	`2184`	`r_total_filtered= out_rows* 100.0 / r_index_rows;`
`2188`	`2185`	`}`
`2189`		`- else`
	`2186`	`+ else if (have_r_filtered)`
`2190`	`2187`	`r_total_filtered= r_filtered;`
`2191`	`2188`
`2192`	`2189`	`writer->add_member("r_total_filtered");`