Merge

sql/opt_range.cc

@@ -3341,10 +3341,7 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item *cond)
     param.is_ror_scan= FALSE;
 
     if (create_key_parts_for_pseudo_indexes(&param, used_fields))
-    {
-      free_root(&alloc, MYF(0));
       goto free_alloc;
-    }
 
     param.prev_tables= param.read_tables= 0;
     param.current_table= table->map;

sql/sql_select.cc

@@ -6988,7 +6988,7 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s,
   /* Discount the selectivity of the access method used to join table s */
   if (s->quick && s->quick->index != MAX_KEY)
   {
-   if (join->positions[idx].key == 0)
+    if (join->positions[idx].key == 0)
     {
       sel*= table->quick_rows[s->quick->index]/table_records;
     }