mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
Merge from mysql-5.1-innodb:
------------------------------------------------------------ revno: 3416 revision-id: marko.makela@oracle.com-20100426073949-txnbqldrl9fdlapx parent: calvin.sun@oracle.com-20100422191614-2atswbilyyxep6rm committer: Marko M?kel? <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Mon 2010-04-26 10:39:49 +0300 message: btr_page_split_and_insert(): Silence a compiler warning about possibly uninitialized variable insert_left. modified: storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c ------------------------------------------------------------
This commit is contained in:
parent
46b1ee7330
commit
865df630ab
1 changed files with 1 additions and 5 deletions
|
@ -1936,6 +1936,7 @@ func_start:
|
|||
/* 1. Decide the split record; split_rec == NULL means that the
|
||||
tuple to be inserted should be the first record on the upper
|
||||
half-page */
|
||||
insert_left = FALSE;
|
||||
|
||||
if (n_iterations > 0) {
|
||||
direction = FSP_UP;
|
||||
|
@ -1949,7 +1950,6 @@ func_start:
|
|||
} else if (btr_page_get_split_rec_to_right(cursor, &split_rec)) {
|
||||
direction = FSP_UP;
|
||||
hint_page_no = page_no + 1;
|
||||
insert_left = FALSE;
|
||||
|
||||
} else if (btr_page_get_split_rec_to_left(cursor, &split_rec)) {
|
||||
direction = FSP_DOWN;
|
||||
|
@ -1972,13 +1972,9 @@ func_start:
|
|||
page_get_infimum_rec(page));
|
||||
} else {
|
||||
split_rec = NULL;
|
||||
insert_left = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* At this point, insert_left is initialized if split_rec == NULL
|
||||
and may be uninitialized otherwise. */
|
||||
|
||||
/* 2. Allocate a new page to the index */
|
||||
new_block = btr_page_alloc(cursor->index, hint_page_no, direction,
|
||||
btr_page_get_level(page, mtr), mtr);
|
||||
|
|
Loading…
Reference in a new issue