diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-05-04 16:47:47 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-05-04 16:47:47 +0300 |
| commit | c8037e6308142355d26d6bfafba1163ec2ae14ae (patch) | |
| tree | be343332d115a9da5e68eb7facd48f58e06734d5 /storage/innobase/btr/btr0btr.c | |
| parent | e51c529be35d4ca97932488d5cde3de8cc97acbe (diff) | |
| download | mariadb-git-c8037e6308142355d26d6bfafba1163ec2ae14ae.tar.gz | |
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3438
revision-id: marko.makela@oracle.com-20100504105546-4ew7a77e9uhxmhho
parent: marko.makela@oracle.com-20100504093128-44v6glupe1dsh0ug
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Tue 2010-05-04 13:55:46 +0300
message:
Remove UNIV_BTR_AVOID_COPY. It was broken because btr_attach_half_pages()
would get the block, new_block in the wrong order.
Fixing that would have complicated the function even further
for this marginal case.
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
------------------------------------------------------------
Diffstat (limited to 'storage/innobase/btr/btr0btr.c')
| -rw-r--r-- | storage/innobase/btr/btr0btr.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c index ef3beac98ad..4d975560331 100644 --- a/storage/innobase/btr/btr0btr.c +++ b/storage/innobase/btr/btr0btr.c @@ -2050,17 +2050,7 @@ insert_empty: } /* 5. Move then the records to the new page */ - if (direction == FSP_DOWN -#ifdef UNIV_BTR_AVOID_COPY - && page_rec_is_supremum(move_limit)) { - /* Instead of moving all records, make the new page - the empty page. */ - - left_block = block; - right_block = new_block; - } else if (direction == FSP_DOWN -#endif /* UNIV_BTR_AVOID_COPY */ - ) { + if (direction == FSP_DOWN) { /* fputs("Split left\n", stderr); */ if (0 @@ -2103,14 +2093,6 @@ insert_empty: right_block = block; lock_update_split_left(right_block, left_block); -#ifdef UNIV_BTR_AVOID_COPY - } else if (!split_rec) { - /* Instead of moving all records, make the new page - the empty page. */ - - left_block = new_block; - right_block = block; -#endif /* UNIV_BTR_AVOID_COPY */ } else { /* fputs("Split right\n", stderr); */ |