diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-09-01 00:23:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-09-01 00:23:30 +0200 |
| commit | 4a8938f6f515a43fe2ba5e997c54982991f48f12 (patch) | |
| tree | cfd91238da39265834ba85df9fae79e68d2fd9e4 | |
| parent | 01ef1f0d7964b1f4c0adff290c406f7d8bd0237e (diff) | |
| download | mariadb-git-4a8938f6f515a43fe2ba5e997c54982991f48f12.tar.gz | |
remove the forgotten commented out piece of the old merge
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0e5aa0e0aaa..57bb9a311d7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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) - keylen_str_buf); 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) tab->select->quick->add_keys_and_lengths(&tmp2, &tmp3); |