diff options
| author | monty@hundin.mysql.fi <> | 2002-04-25 01:16:42 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-04-25 01:16:42 +0300 |
| commit | 727122aadd80f9e1a127bcc1562c8dc95d786e4a (patch) | |
| tree | 539e3f41736108728458d901c552313e5f058e8f /innobase/que/que0que.c | |
| parent | 1f5f3612f30d67029fe9cc2ff5d5e44daa5698f2 (diff) | |
| parent | ecf2c4e15a677a9f33ba8e7d6b2eb6a9da6538e4 (diff) | |
| download | mariadb-git-727122aadd80f9e1a127bcc1562c8dc95d786e4a.tar.gz | |
merge
Diffstat (limited to 'innobase/que/que0que.c')
| -rw-r--r-- | innobase/que/que0que.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c index 1cee316f32c..7fa444f6741 100644 --- a/innobase/que/que0que.c +++ b/innobase/que/que0que.c @@ -555,6 +555,12 @@ que_graph_free_recursive( btr_pcur_free_for_mysql(upd->pcur); } + que_graph_free_recursive(upd->cascade_node); + + if (upd->cascade_heap) { + mem_heap_free(upd->cascade_heap); + } + que_graph_free_recursive(upd->select); mem_heap_free(upd->heap); @@ -1110,9 +1116,6 @@ que_thr_move_to_run_state_for_mysql( trx->n_active_thrs++; thr->is_active = TRUE; - - ut_ad((thr->graph)->n_active_thrs == 1); - ut_ad(trx->n_active_thrs == 1); } thr->state = QUE_THR_RUNNING; |