diff options
| author | unknown <pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-08-20 16:38:55 -0400 |
|---|---|---|
| committer | unknown <pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-08-20 16:38:55 -0400 |
| commit | b221b549dd696fc62746f0952fb311a6204535ad (patch) | |
| tree | b1d89aa88573d321fecce3d621fab7eea24781c1 /heap | |
| parent | fbaf5b04a91e951f5b88d1e494b9697a6d5a44b9 (diff) | |
| parent | ad8c5c9df914366314cd01832521c818b997a21e (diff) | |
| download | mariadb-git-b221b549dd696fc62746f0952fb311a6204535ad.tar.gz | |
Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
heap/hp_delete.c:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/distinct.result:
Manual merge
mysql-test/t/distinct.test:
Manual merge
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_delete.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heap/hp_delete.c b/heap/hp_delete.c index 5287533ae0a..2d94418a1bf 100644 --- a/heap/hp_delete.c +++ b/heap/hp_delete.c @@ -80,7 +80,7 @@ int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo, custom_arg.search_flag= SEARCH_SAME; old_allocated= keyinfo->rb_tree.allocated; res= tree_delete(&keyinfo->rb_tree, info->recbuf, &custom_arg); - info->s->index_length+= (keyinfo->rb_tree.allocated-old_allocated); + info->s->index_length-= (old_allocated - keyinfo->rb_tree.allocated); return res; } |