← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/btr/btr0sea.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/btr0sea.c
171
171
        /* We allocate the search latch from dynamic memory:
172
172
        see above at the global variable definition */
173
173
 
174
 
        btr_search_latch_temp = mem_alloc(sizeof(rw_lock_t));
 
174
        btr_search_latch_temp = (rw_lock_t *)mem_alloc(sizeof(rw_lock_t));
175
175
 
176
176
        rw_lock_create(btr_search_latch_key, &btr_search_latch,
177
177
                       SYNC_SEARCH_SYS);
178
178
        mutex_create(btr_search_enabled_mutex_key,
179
179
                     &btr_search_enabled_mutex, SYNC_SEARCH_SYS_CONF);
180
180
 
181
 
        btr_search_sys = mem_alloc(sizeof(btr_search_sys_t));
 
181
        btr_search_sys = (btr_search_sys_t *)mem_alloc(sizeof(btr_search_sys_t));
182
182
 
183
183
        btr_search_sys->hash_index = ha_create(hash_size, 0, 0);
184
184
}
257
257
{
258
258
        btr_search_t*   info;
259
259
 
260
 
        info = mem_heap_alloc(heap, sizeof(btr_search_t));
 
260
        info = (btr_search_t *)mem_heap_alloc(heap, sizeof(btr_search_t));
261
261
 
262
262
#ifdef UNIV_DEBUG
263
263
        info->magic_n = BTR_SEARCH_MAGIC_N;
639
639
                inside the called function. It might be that the compiler
640
640
                would optimize the call just to pass pointers to block. */
641
641
 
642
 
                params = mem_alloc(3 * sizeof(ulint));
 
642
                params = (ulint *)mem_alloc(3 * sizeof(ulint));
643
643
                params[0] = block->n_fields;
644
644
                params[1] = block->n_bytes;
645
645
                params[2] = block->left_side;
881
881
        ut_ad(rw_lock_get_writer(&btr_search_latch) != RW_LOCK_EX);
882
882
        ut_ad(rw_lock_get_reader_count(&btr_search_latch) > 0);
883
883
 
884
 
        rec = ha_search_and_get_data(btr_search_sys->hash_index, fold);
 
884
        rec = (rec_t *)ha_search_and_get_data(btr_search_sys->hash_index, fold);
885
885
 
886
886
        if (UNIV_UNLIKELY(!rec)) {
887
887
                goto failure_unlock;
1082
1082
        /* Calculate and cache fold values into an array for fast deletion
1083
1083
        from the hash index */
1084
1084
 
1085
 
        folds = mem_alloc(n_recs * sizeof(ulint));
 
1085
        folds = (ulint *)mem_alloc(n_recs * sizeof(ulint));
1086
1086
 
1087
1087
        n_cached = 0;
1088
1088
 
1307
1307
        /* Calculate and cache fold values and corresponding records into
1308
1308
        an array for fast insertion to the hash index */
1309
1309
 
1310
 
        folds = mem_alloc(n_recs * sizeof(ulint));
1311
 
        recs = mem_alloc(n_recs * sizeof(rec_t*));
 
1310
        folds = (ulint *)mem_alloc(n_recs * sizeof(ulint));
 
1311
        recs = (rec_t **)mem_alloc(n_recs * sizeof(rec_t*));
1312
1312
 
1313
1313
        n_cached = 0;
1314
1314