diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-04-20 17:39:05 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-04-20 17:39:05 +0300 |
| commit | ea5c2a148a6b704265324a2adcd7ae779a0df0b0 (patch) | |
| tree | 385dcdcccffb58642b6b6a5b9d7a9415e6622429 /innobase/ibuf | |
| parent | dfa485b47dd768304a5324f619af3da374c6165d (diff) | |
| download | mariadb-git-ea5c2a148a6b704265324a2adcd7ae779a0df0b0.tar.gz | |
InnoDB: Make CHECK TABLE killable. (Bug #9730)
innobase/btr/btr0btr.c:
Enclose btr_print_size() and btr_print_tree() in #ifdef UNIV_BTR_PRINT
Add trx_t* parameter to btr_validate_tree() and btr_validate_level().
btr_validate_level(): Call trx_is_interrupted() on each page.
innobase/ibuf/ibuf0ibuf.c:
Add trx_t* parameter to btr_validate_tree().
innobase/include/btr0btr.h:
Enclose btr_print_size() and btr_print_tree() in #ifdef UNIV_BTR_PRINT
Add trx_t* parameter to btr_validate_tree().
innobase/include/trx0trx.h:
Declare trx_is_interrupted().
innobase/row/row0mysql.c:
row_scan_and_check_index(): Check trx_is_interrupted() every 1,000
scanned rows.
row_check_table_for_mysql(): Check trx_is_interrupted()
for each index after btr_validate_tree().
sql/ha_innodb.cc:
Define trx_is_interrupted().
Diffstat (limited to 'innobase/ibuf')
| -rw-r--r-- | innobase/ibuf/ibuf0ibuf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c index caa2ac013d7..c72bb2b1b65 100644 --- a/innobase/ibuf/ibuf0ibuf.c +++ b/innobase/ibuf/ibuf0ibuf.c @@ -2969,7 +2969,9 @@ ibuf_delete_rec( btr_pcur_commit_specify_mtr(pcur, mtr); fputs("InnoDB: Validating insert buffer tree:\n", stderr); - ut_a(btr_validate_tree(ibuf_data->index->tree)); + if (!btr_validate_tree(ibuf_data->index->tree, NULL)) { + ut_error; + } fprintf(stderr, "InnoDB: ibuf tree ok\n"); fflush(stderr); |