Commit 4a8938f6 authored by Sergei Golubchik's avatar Sergei Golubchik

remove the forgotten commented out piece of the old merge

parent 01ef1f0d
...@@ -21549,11 +21549,6 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order, ...@@ -21549,11 +21549,6 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
length= (longlong10_to_str(key_len, keylen_str_buf, 10) - length= (longlong10_to_str(key_len, keylen_str_buf, 10) -
keylen_str_buf); keylen_str_buf);
tmp3.append(keylen_str_buf, length, cs); tmp3.append(keylen_str_buf, length, cs);
/*<<<<<<< TREE
}
if ((is_hj || tab->type==JT_RANGE || tab->type == JT_INDEX_MERGE) &&
tab->select && tab->select->quick)
=======*/
} }
if (tab->type != JT_CONST && tab->select && tab->select->quick) if (tab->type != JT_CONST && tab->select && tab->select->quick)
tab->select->quick->add_keys_and_lengths(&tmp2, &tmp3); tab->select->quick->add_keys_and_lengths(&tmp2, &tmp3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment