diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-09-03 19:42:54 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-09-03 19:42:54 +0200 |
| commit | c21a7a6bb2bed5f159dfba64e7a5220a5ee78cab (patch) | |
| tree | aab22730a36718adb824289458f98b86006f5c32 /storage/xtradb/btr/btr0btr.c | |
| parent | 401c69e49babc293da30f833c18673f5f071eca3 (diff) | |
| parent | 9ec2d5b6e510b9a3ad2fd54c37eb302c0121f9e3 (diff) | |
| download | mariadb-git-c21a7a6bb2bed5f159dfba64e7a5220a5ee78cab.tar.gz | |
Merge XtraDB from Percona server 5.1.49-12 into MariaDB.
Diffstat (limited to 'storage/xtradb/btr/btr0btr.c')
| -rw-r--r-- | storage/xtradb/btr/btr0btr.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/storage/xtradb/btr/btr0btr.c b/storage/xtradb/btr/btr0btr.c index 12e57dcc490..ff047095aa4 100644 --- a/storage/xtradb/btr/btr0btr.c +++ b/storage/xtradb/btr/btr0btr.c @@ -2030,6 +2030,7 @@ func_start: goto insert_empty; } } else if (UNIV_UNLIKELY(insert_left)) { + ut_a(n_iterations > 0); first_rec = page_rec_get_next(page_get_infimum_rec(page)); move_limit = page_rec_get_next(btr_cur_get_rec(cursor)); } else { @@ -2076,17 +2077,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 @@ -2129,14 +2120,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); */ |