diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-09 22:23:41 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-09 22:23:41 -0400 |
| commit | 60201f0de84066efa8347c9d41c1e8802a69792d (patch) | |
| tree | d69877217b5d46b9f37fd63c1e665f2c8e6d2648 /heap | |
| parent | 899f24e0a2e7d330de464a4d006fde91a3fedb54 (diff) | |
| parent | cc12757621220dc1e3c14eb26d39f61af64daee5 (diff) | |
| download | mariadb-git-60201f0de84066efa8347c9d41c1e8802a69792d.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
client/mysql.cc:
Auto merged
heap/hp_delete.c:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/grant2.result:
Manual merge
mysql-test/r/heap_btree.result:
Manual merge
mysql-test/r/mysql_client.result:
Manual merge
mysql-test/t/grant2.test:
Manual merge
mysql-test/t/heap_btree.test:
Manual merge
mysql-test/t/mysql_client.test:
Manual merge
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_delete.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/heap/hp_delete.c b/heap/hp_delete.c index f37db2588f3..f18c5e7054c 100644 --- a/heap/hp_delete.c +++ b/heap/hp_delete.c @@ -73,7 +73,10 @@ int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo, int res; if (flag) + { info->last_pos= NULL; /* For heap_rnext/heap_rprev */ + info->lastkey_len= 0; + } custom_arg.keyseg= keyinfo->seg; custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos); |