diff options
| author | bell@sanja.is.com.ua <> | 2004-05-19 17:09:40 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-05-19 17:09:40 +0300 |
| commit | bd010b1ec33189a4578c0fd61ee76dc090b86120 (patch) | |
| tree | cc719f08c9901d8cb4614a46901eb4e6adc9c3fe /sql/sql_select.cc | |
| parent | d42d709171cae604dba0c6216a0d0d1878ae16c3 (diff) | |
| parent | ba749627ae3eef81fb0365d8d71f5371eaa8d0a2 (diff) | |
| download | mariadb-git-bd010b1ec33189a4578c0fd61ee76dc090b86120.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 194f27e6fb8..6da778f6196 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -665,7 +665,6 @@ JOIN::optimize() if (!order && org_order) skip_sort_order= 1; } - order= remove_const(this, order, conds, &simple_order); if (group_list || tmp_table_param.sum_func_count) { if (! hidden_group_fields) @@ -6161,8 +6160,8 @@ join_read_prev_same(READ_RECORD *info) if ((error=table->file->index_prev(table->record[0]))) return report_error(table, error); - if (key_cmp(table, tab->ref.key_buff, tab->ref.key, - tab->ref.key_length)) + if (key_cmp_if_same(table, tab->ref.key_buff, tab->ref.key, + tab->ref.key_length)) { table->status=STATUS_NOT_FOUND; error= -1; @@ -9455,7 +9454,7 @@ void st_select_lex::print(THD *thd, String *str) if (!thd->lex->safe_to_cache_query) str->append("sql_no_cache ", 13); if (options & OPTION_TO_QUERY_CACHE) - str->append("cache ", 6); + str->append("sql_cache ", 10); //Item List bool first= 1; |