Bug#32855925 SELECT #2 WILL BE DISPLAYED TWICE WHEN WE EXPLAIN THE SQL

Post-push fix: Cherry-picking the fix onto mysql-trunk introduced an
unintended duplication of a code block, causing a shadowing-warning
when building with g++. This commit corrects that.

Change-Id: I1b279818ca0d30e32fc8dabb76c647120b531e8f

Author: Jan Wedvik

sql/join_optimizer/explain_access_path.cc

@@ -237,23 +237,8 @@ static bool AddSubqueryPaths(const Item *item_arg, const char *source_text,
 
     const Item_subselect *subquery = down_cast<const Item_subselect *>(item);
     Query_expression *qe = subquery->query_expr();
-    Query_block *query_block = qe->first_query_block();
-    char description[256];
-    if (query_block->is_dependent()) {
-      snprintf(description, sizeof(description),
-               "Select #%d (subquery in %s; dependent)",
-               query_block->select_number, source_text);
-    } else if (!query_block->is_cacheable()) {
-      snprintf(description, sizeof(description),
-               "Select #%d (subquery in %s; uncacheable)",
-               query_block->select_number, source_text);
-    } else {
-      snprintf(description, sizeof(description),
-               "Select #%d (subquery in %s; run only once)",
-               query_block->select_number, source_text);
-    }
-
     qe->finalize(current_thd);
+    Query_block *query_block = qe->first_query_block();
     AccessPath *path;
 
     if (qe->root_access_path() != nullptr) {