mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

Browse source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
This commit is contained in:
unknown 2002-06-17 21:00:50 +03:00
commit 4da6a2c149
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
myisammrg/myrg_rprev.c
View file

@ -25,6 +25,9 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx)
int err; int err;
MI_INFO *mi; MI_INFO *mi;
if (!info || !info->current_table)
return HA_ERR_UNSUPPORTED;
/* at first, do rprev for the table found before */ /* at first, do rprev for the table found before */
if ((err=mi_rprev(info->current_table->table,NULL,inx))) if ((err=mi_rprev(info->current_table->table,NULL,inx)))
{ {

11
sql/opt_sum.cc
View file

@ -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; error=table->file->index_last(table->record[0]) !=0;
else else
{ {
error= table->file->index_read(table->record[0], key_buff, (void)table->file->index_read(table->record[0], key_buff,
ref.key_length, ref.key_length,
HA_READ_AFTER_KEY); HA_READ_AFTER_KEY);
if (!error) error=table->file->index_prev(table->record[0]) ||
error=table->file->index_prev(table->record[0]) || key_cmp(table,key_buff,ref.key,ref.key_length);
key_cmp(table,key_buff,ref.key,ref.key_length);
} }
if (table->key_read) if (table->key_read)
{ {