← Back to branch summary

~stewart/drizzle/docs-improvements-1

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0rec.cc

merged with up to date trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/trx/trx0rec.cc
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (C) 1996, 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
938
938
        /* Store first trx id and roll ptr to update vector */
939
939
 
940
940
        upd_field = upd_get_nth_field(update, n_fields);
941
 
        buf = mem_heap_alloc(heap, DATA_TRX_ID_LEN);
 
941
        buf = static_cast<byte *>(mem_heap_alloc(heap, DATA_TRX_ID_LEN));
942
942
        trx_write_trx_id(buf, trx_id);
943
943
 
944
944
        upd_field_set_field_no(upd_field,
947
947
        dfield_set_data(&(upd_field->new_val), buf, DATA_TRX_ID_LEN);
948
948
 
949
949
        upd_field = upd_get_nth_field(update, n_fields + 1);
950
 
        buf = mem_heap_alloc(heap, DATA_ROLL_PTR_LEN);
 
950
        buf = static_cast<byte *>(mem_heap_alloc(heap, DATA_ROLL_PTR_LEN));
951
951
        trx_write_roll_ptr(buf, roll_ptr);
952
952
 
953
953
        upd_field_set_field_no(
1123
1123
trx_undo_parse_erase_page_end(
1124
1124
/*==========================*/
1125
1125
        byte*   ptr,    /*!< in: buffer */
1126
 
        byte*   end_ptr __attribute__((unused)), /*!< in: buffer end */
 
1126
        byte*   /*end_ptr*/, /*!< in: buffer end */
1127
1127
        page_t* page,   /*!< in: page or NULL */
1128
1128
        mtr_t*  mtr)    /*!< in: mtr or NULL */
1129
1129
{
1414
1414
/*========================*/
1415
1415
        const rec_t*    index_rec,/*!< in: clustered index record in the
1416
1416
                                index tree */
1417
 
        mtr_t*          index_mtr __attribute__((unused)),
 
1417
        mtr_t*          /*index_mtr*/,
1418
1418
                                /*!< in: mtr which contains the latch to
1419
1419
                                index_rec page and purge_view */
1420
1420
        const rec_t*    rec,    /*!< in: version of a clustered index record */
1588
1588
                following call is safe. */
1589
1589
                row_upd_index_replace_new_col_vals(entry, index, update, heap);
1590
1590
 
1591
 
                buf = mem_heap_alloc(heap, rec_get_converted_size(index, entry,
1592
 
                                                                  n_ext));
 
1591
                buf = static_cast<byte *>(mem_heap_alloc(heap, rec_get_converted_size(index, entry,
 
1592
                                                                  n_ext)));
1593
1593
 
1594
1594
                *old_vers = rec_convert_dtuple_to_rec(buf, index,
1595
1595
                                                      entry, n_ext);
1596
1596
        } else {
1597
 
                buf = mem_heap_alloc(heap, rec_offs_size(offsets));
 
1597
                buf = static_cast<byte *>(mem_heap_alloc(heap, rec_offs_size(offsets)));
1598
1598
                *old_vers = rec_copy(buf, rec, offsets);
1599
1599
                rec_offs_make_valid(*old_vers, index, offsets);
1600
1600
                row_upd_rec_in_place(*old_vers, index, offsets, update, NULL);