diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-19 00:38:58 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-19 00:38:58 +0300 |
| commit | 424ad58becc12bdc0b0f5b3defaaa92af0e66b8e (patch) | |
| tree | 757f52132618d2c6ba29110ce266a757c8864dd1 /sql | |
| parent | 518787c29965d10f65a7e9c073718076aceb058c (diff) | |
| parent | adc508c9011ded5506277d564c641070c0d9dc4d (diff) | |
| download | mariadb-git-424ad58becc12bdc0b0f5b3defaaa92af0e66b8e.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_sum.cc | 11 | ||||
| -rw-r--r-- | sql/sql_update.cc | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 7ffbb7ba8ea..74e7b2ef3be 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -152,12 +152,11 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) error=table->file->index_last(table->record[0]) !=0; else { - error= table->file->index_read(table->record[0], key_buff, - ref.key_length, - HA_READ_AFTER_KEY); - if (!error) - error=table->file->index_prev(table->record[0]) || - key_cmp(table,key_buff,ref.key,ref.key_length); + (void)table->file->index_read(table->record[0], key_buff, + ref.key_length, + HA_READ_AFTER_KEY); + error=table->file->index_prev(table->record[0]) || + key_cmp(table,key_buff,ref.key,ref.key_length); } if (table->key_read) { diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 91e464c376e..7fcd25e2acf 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -506,7 +506,7 @@ multi_update::prepare(List<Item> &values) void multi_update::initialize_tables(JOIN *join) { -/* +#ifdef NOT_YET We skip it as it only makes a mess ........... TABLE_LIST *walk; table_map tables_to_update_from=0; @@ -522,12 +522,12 @@ multi_update::initialize_tables(JOIN *join) { We are going to update from this table TABLE *tbl=walk->table=tab->table; - Don't use KEYREAD optimization on this table + /* Don't use KEYREAD optimization on this table */ tbl->no_keyread=1; walk=walk->next; } } -*/ +#endif } |