Commit 3aff0a47 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.0
parents 6985839a a2356e30

myisammrg/myrg_rprev.c

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx) 
  int err;

  MI_INFO *mi;



  if (!info || !info->current_table)

    return HA_ERR_UNSUPPORTED;



  /* at first, do rprev for the table found before */

  if ((err=mi_rprev(info->current_table->table,NULL,inx)))

  {

sql/opt_sum.cc

+5 −6
Original line number Diff line number Diff line
@@ -152,10 +152,9 @@ 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,

	    (void)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);

	  }