Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

mysql-test/r/merge.result

@@ -536,7 +536,7 @@ INSERT INTO t2 VALUES (1,2), (2,2);
 CREATE TABLE t (  a int(11) NOT NULL default '0',  b int(11) NOT NULL default '0',  KEY a (a,b)) TYPE=MRG_MyISAM UNION=(t1,t2);
 select max(b) from t where a = 2;
 max(b)
-NULL
+2
 select max(b) from t1 where a = 2;
 max(b)
 1

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)