database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

remove the forgotten commented out piece of the old merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-09-01 00:23:30 +02:00
parent 01ef1f0d79
commit 4a8938f6f5
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@@ -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);