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

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1


mysql-test/r/func_encrypt.result:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
This commit is contained in:
unknown
2004-05-19 17:09:40 +03:00
parent 9fb55cefac de2c35230f
commit efcb7706c4
149 changed files with 1764 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.cc
View File

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