database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post-merge fixes

Browse Source
This commit is contained in:
unknown
2005-10-19 12:41:30 +04:00
parent 8698ffc968
commit c5f9e201eb
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/opt_range.cc
View File

@ -1401,7 +1401,7 @@ uint get_index_for_order(TABLE *table, ORDER *order, ha_rows limit)
if (!ord->asc) if (!ord->asc)
return MAX_KEY; return MAX_KEY;
for (idx= 0; idx < table->keys; idx++) for (idx= 0; idx < table->s->keys; idx++)
{ {
if (!(table->keys_in_use_for_query.is_set(idx))) if (!(table->keys_in_use_for_query.is_set(idx)))
continue; continue;

4
sql/sql_delete.cc
View File

@ -147,7 +147,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
{ {
delete select; delete select;
free_underlaid_joins(thd, &thd->lex->select_lex); free_underlaid_joins(thd, &thd->lex->select_lex);
DBUG_RETURN(-1); // This will force out message DBUG_RETURN(TRUE);
} }
if (!select && limit != HA_POS_ERROR) if (!select && limit != HA_POS_ERROR)
@ -166,7 +166,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
{ {
delete select; delete select;
free_underlaid_joins(thd, &thd->lex->select_lex); free_underlaid_joins(thd, &thd->lex->select_lex);
DBUG_RETURN(-1); // This will force out message
} }
/* /*
Filesort has already found and selected the rows we want to delete, Filesort has already found and selected the rows we want to delete,
@ -175,7 +174,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
delete select; delete select;
free_underlaid_joins(thd, select_lex); free_underlaid_joins(thd, select_lex);
select= 0; select= 0;
DBUG_RETURN(TRUE);
} }
} }