Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/work/4.1.latest

heap/hp_rkey.c

@@ -38,7 +38,7 @@ int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key,
 
     custom_arg.keyseg= info->s->keydef[inx].seg;
     custom_arg.key_length= info->lastkey_len= 
-      hp_rb_pack_key(keyinfo, (uchar*) info->recbuf,
+      hp_rb_pack_key(keyinfo, (uchar*) info->lastkey,
 		     (uchar*) key, key_len);
     custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
     /* for next rkey() after deletion */
@@ -48,7 +48,7 @@ int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key,
       info->last_find_flag= HA_READ_KEY_OR_PREV;
     else
       info->last_find_flag= find_flag;
-    if (!(pos= tree_search_key(&keyinfo->rb_tree, info->recbuf, info->parents,
+    if (!(pos= tree_search_key(&keyinfo->rb_tree, info->lastkey, info->parents,
 			       &info->last_pos, find_flag, &custom_arg)))
     {
       info->update= 0;

mysql-test/r/heap_btree.result

@@ -24,8 +24,8 @@ a	b
 alter table t1 add c int not null, add key using BTREE (c,a);
 drop table t1;
 create table t1 (a int not null,b int not null, primary key using BTREE (a)) type=heap comment="testing heaps";
-insert into t1 values(1,1),(2,2),(3,3),(4,4);
-delete from t1 where a > 0;
+insert into t1 values(-2,-2),(-1,-1),(0,0),(1,1),(2,2),(3,3),(4,4);
+delete from t1 where a > -3;
 select * from t1;
 a	b
 drop table t1;

mysql-test/t/heap_btree.test

@@ -21,8 +21,8 @@ alter table t1 add c int not null, add key using BTREE (c,a);
 drop table t1;
 
 create table t1 (a int not null,b int not null, primary key using BTREE (a)) type=heap comment="testing heaps";
-insert into t1 values(1,1),(2,2),(3,3),(4,4);
-delete from t1 where a > 0;
+insert into t1 values(-2,-2),(-1,-1),(0,0),(1,1),(2,2),(3,3),(4,4);
+delete from t1 where a > -3;
 select * from t1;
 drop table t1;