diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-06-17 13:25:06 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-06-17 13:25:06 +0300 |
| commit | a7139dd280e82a25ce2cbab80a10234b3911f215 (patch) | |
| tree | 717a0df66b78f8229972912ed8c3b2c072894942 /innobase/row | |
| parent | 3414f67485dc7c6d55428691d8a62410bb8c630b (diff) | |
| download | mariadb-git-a7139dd280e82a25ce2cbab80a10234b3911f215.tar.gz | |
Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613
innobase/trx/trx0sys.c:
Remove #ifdef UNIV_HOT_BACKUP: best to keep the codebase as uniform as possible
innobase/dict/dict0dict.c:
Exclude
innobase/dict/dict0mem.c:
Exclude
innobase/ha/hash0hash.c:
Exclude
innobase/include/data0data.h:
Exclude
innobase/include/dict0mem.h:
Exclude
innobase/include/hash0hash.h:
Exclude
innobase/include/hash0hash.ic:
Exclude
innobase/include/mtr0mtr.h:
Exclude
innobase/include/row0ins.h:
Exclude
innobase/include/row0upd.h:
Exclude
innobase/row/row0ins.c:
Exclude
innobase/row/row0upd.c:
Exclude
innobase/thr/thr0loc.c:
Exclude
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0ins.c | 10 | ||||
| -rw-r--r-- | innobase/row/row0upd.c | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c index 8f1c1370f25..93d360eaaeb 100644 --- a/innobase/row/row0ins.c +++ b/innobase/row/row0ins.c @@ -80,9 +80,9 @@ ins_node_create( node->trx_id = ut_dulint_zero; node->entry_sys_heap = mem_heap_create(128); -#ifdef UNIV_DEBUG - node->magic_n = INS_NODE_MAGIC_N; -#endif /* UNIV_DEBUG */ + + node->magic_n = INS_NODE_MAGIC_N; + return(node); } @@ -194,7 +194,6 @@ ins_node_set_new_row( ins_node_t* node, /* in: insert node */ dtuple_t* row) /* in: new row (or first row) for the node */ { - ut_ad(node->magic_n == INS_NODE_MAGIC_N); node->state = INS_NODE_SET_IX_LOCK; node->index = NULL; node->entry = NULL; @@ -2004,7 +2003,6 @@ row_ins( ulint err; ut_ad(node && thr); - ut_ad(node->magic_n == INS_NODE_MAGIC_N); if (node->state == INS_NODE_ALLOC_ROW_ID) { @@ -2069,7 +2067,7 @@ row_ins_step( trx_start_if_not_started(trx); node = thr->run_node; - ut_ad(node->magic_n == INS_NODE_MAGIC_N); + ut_ad(que_node_get_type(node) == QUE_NODE_INSERT); parent = que_node_get_parent(node); diff --git a/innobase/row/row0upd.c b/innobase/row/row0upd.c index e7894e543bc..22f7ba60ca4 100644 --- a/innobase/row/row0upd.c +++ b/innobase/row/row0upd.c @@ -287,9 +287,7 @@ upd_node_create( node->select = NULL; node->heap = mem_heap_create(128); -#ifdef UNIV_DEBUG - node->magic_n = UPD_NODE_MAGIC_N; -#endif /* UNIV_DEBUG */ + node->magic_n = UPD_NODE_MAGIC_N; node->cmpl_info = 0; @@ -1805,7 +1803,6 @@ row_upd_step( trx_start_if_not_started(trx); node = thr->run_node; - ut_ad(node->magic_n == UPD_NODE_MAGIC_N); sel_node = node->select; @@ -1925,7 +1922,6 @@ row_upd_in_place_in_select( node = que_node_get_parent(sel_node); - ut_ad(node->magic_n == UPD_NODE_MAGIC_N); ut_ad(que_node_get_type(node) == QUE_NODE_UPDATE); pcur = node->pcur; |