← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-12-07 09:12:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1985.
  • Revision ID: brian@tangent.org-20101207091212-1m0w20tck6z7632m
This is a fix for bug lp:686197

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/row/row0upd.c
1636
1636
        dict_table_t*   table;
1637
1637
        dtuple_t*       entry;
1638
1638
        ulint           err;
1639
 
        ibool           change_ownership = FALSE;
1640
1639
 
1641
1640
        ut_ad(node);
1642
1641
        ut_ad(dict_index_is_clust(index));
1669
1668
                index = dict_table_get_first_index(table);
1670
1669
                offsets = rec_get_offsets(rec, index, offsets_,
1671
1670
                                          ULINT_UNDEFINED, &heap);
1672
 
                change_ownership = btr_cur_mark_extern_inherited_fields(
1673
 
                        btr_cur_get_page_zip(btr_cur), rec, index, offsets,
1674
 
                        node->update, mtr);
 
1671
                btr_cur_mark_extern_inherited_fields(
 
1672
                        btr_cur_get_page_zip(btr_cur),
 
1673
                        rec, index, offsets, node->update, mtr);
1675
1674
                if (referenced) {
1676
1675
                        /* NOTE that the following call loses
1677
1676
                        the position of pcur ! */
1705
1704
 
1706
1705
        row_upd_index_entry_sys_field(entry, index, DATA_TRX_ID, trx->id);
1707
1706
 
1708
 
        if (change_ownership) {
 
1707
        if (node->upd_ext) {
1709
1708
                /* If we return from a lock wait, for example, we may have
1710
1709
                extern fields marked as not-owned in entry (marked in the
1711
 
                if-branch above). We must unmark them, take the ownership
1712
 
                back. */
 
1710
                if-branch above). We must unmark them. */
1713
1711
 
1714
1712
                btr_cur_unmark_dtuple_extern_fields(entry);
1715
1713