diff options
| author | unknown <sergefp@mysql.com> | 2005-10-19 12:41:30 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-10-19 12:41:30 +0400 |
| commit | 188ce9ec5735c85886e8281612025c14cf35c6a2 (patch) | |
| tree | 78335682bf1cbbc0ed6e5f601e65d8944748366a | |
| parent | 332b4ce6e7f74898bcc503278247d3c71582576c (diff) | |
| download | mariadb-git-188ce9ec5735c85886e8281612025c14cf35c6a2.tar.gz | |
Post-merge fixes
| -rw-r--r-- | sql/opt_range.cc | 2 | ||||
| -rw-r--r-- | sql/sql_delete.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 7e1821b9953..ff2b14a27ee 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1401,7 +1401,7 @@ uint get_index_for_order(TABLE *table, ORDER *order, ha_rows limit) if (!ord->asc) 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))) continue; diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 1690f96a3d4..83f50ba3ac5 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -147,7 +147,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, { delete select; 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) @@ -166,7 +166,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, { delete select; 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, @@ -175,7 +174,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, delete select; free_underlaid_joins(thd, select_lex); select= 0; - DBUG_RETURN(TRUE); } } |