diff options
| author | unknown <monty@bitch.mysql.fi> | 2002-06-03 14:43:44 +0300 |
|---|---|---|
| committer | unknown <monty@bitch.mysql.fi> | 2002-06-03 14:43:44 +0300 |
| commit | dddd9084a0ca7ce1e9e60a65ddb3fb8087912249 (patch) | |
| tree | 635cb4a7da4d21106255bd614f818e63c5905ede /innobase/que/que0que.c | |
| parent | c8ca330db07a4739b58800ccc75c097a157417a6 (diff) | |
| parent | 7daf5a5d0ee7b52508943c7095a2cc150abcf616 (diff) | |
| download | mariadb-git-dddd9084a0ca7ce1e9e60a65ddb3fb8087912249.tar.gz | |
Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
innobase/pars/pars0opt.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
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; |