~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/row/row0purge.c

  • Committer: Lee Bieber
  • Date: 2010-12-15 16:23:36 UTC
  • mfrom: (1995.1.2 build)
  • Revision ID: kalebral@gmail.com-20101215162336-juntyt4gw4vgohg4
Merge Andrew - fix bug 628912: Crash / segfault in drizzled::Item_func::arguments (this=0x35) at ./drizzled/function/func.h
Merge Andrew - 663919: next query after KILL QUERY will error

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1997, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1997, 2010, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
78
78
 
79
79
        ut_ad(parent && heap);
80
80
 
81
 
        node = static_cast<purge_node_t *>(mem_heap_alloc(heap, sizeof(purge_node_t)));
 
81
        node = mem_heap_alloc(heap, sizeof(purge_node_t));
82
82
 
83
83
        node->common.type = QUE_NODE_PURGE;
84
84
        node->common.parent = parent;
380
380
        pcur.btr_cur.purge_node = node;
381
381
        /* Set the query thread, so that ibuf_insert_low() will be
382
382
        able to invoke thd_get_trx(). */
383
 
        pcur.btr_cur.thr = static_cast<que_thr_t *>(que_node_get_parent(node));
 
383
        pcur.btr_cur.thr = que_node_get_parent(node);
384
384
 
385
385
        search_result = row_search_index_entry(
386
386
                index, entry, BTR_MODIFY_LEAF | BTR_DELETE, &pcur, &mtr);
802
802
 
803
803
        ut_ad(thr);
804
804
 
805
 
        node = static_cast<purge_node_t *>(thr->run_node);
 
805
        node = thr->run_node;
806
806
 
807
807
        ut_ad(que_node_get_type(node) == QUE_NODE_PURGE);
808
808