← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/btr/btr0cur.c

Merge Monty - Updates to pandora-build to support features of gcc 4.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/btr/btr0cur.c
3520
3520
 
3521
3521
        n_cols = dict_index_get_n_unique(index);
3522
3522
 
3523
 
        n_diff = mem_zalloc((n_cols + 1) * sizeof(ib_int64_t));
 
3523
        n_diff = (ib_int64_t *)mem_zalloc((n_cols + 1) * sizeof(ib_int64_t));
3524
3524
 
3525
3525
        /* It makes no sense to test more pages than are contained
3526
3526
        in the index, thus we lower the number if it is too high */
3851
3851
                        }
3852
3852
                }
3853
3853
 
3854
 
                data = dfield_get_data(dfield);
 
3854
                data = (unsigned char *)dfield_get_data(dfield);
3855
3855
                len = dfield_get_len(dfield);
3856
3856
                data[len - BTR_EXTERN_FIELD_REF_SIZE + BTR_EXTERN_LEN]
3857
3857
                        |= BTR_EXTERN_INHERITED_FLAG;
3910
3910
                dfield_t* dfield = dtuple_get_nth_field(entry, i);
3911
3911
 
3912
3912
                if (dfield_is_ext(dfield)) {
3913
 
                        byte*   data = dfield_get_data(dfield);
 
3913
                        byte*   data = (unsigned char *)dfield_get_data(dfield);
3914
3914
                        ulint   len = dfield_get_len(dfield);
3915
3915
 
3916
3916
                        data[len - BTR_EXTERN_FIELD_REF_SIZE + BTR_EXTERN_LEN]
3976
3976
                                will have to be copied. */
3977
3977
                                ut_a(uf->orig_len > BTR_EXTERN_FIELD_REF_SIZE);
3978
3978
 
3979
 
                                data = dfield_get_data(field);
 
3979
                                data = (unsigned char *)dfield_get_data(field);
3980
3980
                                len = dfield_get_len(field);
3981
3981
 
3982
 
                                buf = mem_heap_alloc(heap, uf->orig_len);
 
3982
                                buf = (unsigned char *)mem_heap_alloc(heap, uf->orig_len);
3983
3983
                                /* Copy the locally stored prefix. */
3984
3984
                                memcpy(buf, data,
3985
3985
                                       uf->orig_len
4165
4165
                        int     err = deflateReset(&c_stream);
4166
4166
                        ut_a(err == Z_OK);
4167
4167
 
4168
 
                        c_stream.next_in = (void*) big_rec_vec->fields[i].data;
 
4168
                        c_stream.next_in = (Bytef *) big_rec_vec->fields[i].data;
4169
4169
                        c_stream.avail_in = extern_len;
4170
4170
                }
4171
4171
 
5087
5087
 
5088
5088
        extern_len = mach_read_from_4(data + local_len + BTR_EXTERN_LEN + 4);
5089
5089
 
5090
 
        buf = mem_heap_alloc(heap, local_len + extern_len);
 
5090
        buf = (unsigned char *)mem_heap_alloc(heap, local_len + extern_len);
5091
5091
 
5092
5092
        memcpy(buf, data, local_len);
5093
5093
        *len = local_len