← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/row/row0row.cc

  • Committer: Lee Bieber
  • Date: 2010-12-28 17:42:52 UTC
  • mfrom: (2023.3.32 innodb-cxx)
  • Revision ID: kalebral@gmail.com-20101228174252-fy2isiqdaphf2gl3
Merge Monty, move innobase from C to C++

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/row/row0row.cc
55
55
ulint
56
56
row_get_trx_id_offset(
57
57
/*==================*/
58
 
        const rec_t*    rec __attribute__((unused)),
 
58
        const rec_t*    /*rec __attribute__((unused))*/,
59
59
                                /*!< in: record */
60
60
        dict_index_t*   index,  /*!< in: clustered index */
61
61
        const ulint*    offsets)/*!< in: rec_get_offsets(rec, index) */
157
157
 
158
158
                len = dtype_get_at_most_n_mbchars(
159
159
                        col->prtype, col->mbminmaxlen,
160
 
                        ind_field->prefix_len, len, dfield_get_data(dfield));
 
160
                        ind_field->prefix_len, len, static_cast<const char *>(dfield_get_data(dfield)));
161
161
                dfield_set_len(dfield, len);
162
162
        }
163
163
 
233
233
 
234
234
        if (type != ROW_COPY_POINTERS) {
235
235
                /* Take a copy of rec to heap */
236
 
                buf = mem_heap_alloc(heap, rec_offs_size(offsets));
 
236
                buf = static_cast<byte *>(mem_heap_alloc(heap, rec_offs_size(offsets)));
237
237
                rec = rec_copy(buf, rec, offsets);
238
238
                /* Avoid a debug assertion in rec_offs_validate(). */
239
239
                rec_offs_make_valid(rec, index, (ulint*) offsets);
252
252
        n_fields = rec_offs_n_fields(offsets);
253
253
        n_ext_cols = rec_offs_n_extern(offsets);
254
254
        if (n_ext_cols) {
255
 
                ext_cols = mem_heap_alloc(heap, n_ext_cols * sizeof *ext_cols);
 
255
                ext_cols = static_cast<ulint *>(mem_heap_alloc(heap, n_ext_cols * sizeof *ext_cols));
256
256
        }
257
257
 
258
258
        for (i = j = 0; i < n_fields; i++) {
411
411
 
412
412
        if (type == ROW_COPY_DATA) {
413
413
                /* Take a copy of rec to heap */
414
 
                buf = mem_heap_alloc(heap, rec_offs_size(offsets));
 
414
                buf = static_cast<byte *>(mem_heap_alloc(heap, rec_offs_size(offsets)));
415
415
                rec = rec_copy(buf, rec, offsets);
416
416
                /* Avoid a debug assertion in rec_offs_validate(). */
417
417
                rec_offs_make_valid(rec, index, offsets);
475
475
        if (type == ROW_COPY_DATA) {
476
476
                /* Take a copy of rec to heap */
477
477
 
478
 
                buf = mem_heap_alloc(heap, rec_offs_size(offsets));
 
478
                buf = static_cast<byte *>(mem_heap_alloc(heap, rec_offs_size(offsets)));
479
479
 
480
480
                rec = rec_copy(buf, rec, offsets);
481
481
                /* Avoid a debug assertion in rec_offs_validate(). */