diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-17 14:23:48 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-17 14:23:48 +0200 |
| commit | 2ab15331643c2896de97cd77fef2f9b196710e24 (patch) | |
| tree | 52fa8a08859a024dba610b0e1d6a59bb82de374e /sql/opt_sum.cc | |
| parent | 23b96b205237877b1a4137913ae1df8009c1c50c (diff) | |
| parent | 470c7dc3d503d4a9bb6b685fa2150411b2a9bee4 (diff) | |
| download | mariadb-git-2ab15331643c2896de97cd77fef2f9b196710e24.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 4b6a196051e..ecfa97586e9 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -38,7 +38,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) table_map removed_tables=0; Item *item; COND *org_conds= conds; - + /* Add all ON conditions to WHERE condition */ for (TABLE_LIST *tl=tables; tl ; tl= tl->next) { @@ -165,10 +165,9 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) error=table->file->index_last(table->record[0]) !=0; else { - (void)table->file->index_read(table->record[0], key_buff, + error = table->file->index_read(table->record[0], key_buff, ref.key_length, - HA_READ_AFTER_KEY); - error=table->file->index_prev(table->record[0]) || + HA_READ_PREFIX_LAST) || key_cmp(table,key_buff,ref.key,ref.key_length); } if (table->key_read) |