← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/data/data0data.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 01:32:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226013211-c1tx52h7evovmijg
fixed dict and eval.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/data/data0data.cc
364
364
 
365
365
        prtype = dtype_get_prtype(dfield_get_type(dfield));
366
366
 
 
367
        ib_id_t id= 0;
367
368
        switch (dtype_get_mtype(dfield_get_type(dfield))) {
368
 
                ib_id_t id;
369
369
        case DATA_INT:
 
370
                ulint   val= 0;
370
371
                switch (len) {
371
 
                        ulint   val= 0;
372
372
                case 1:
373
373
                        val = mach_read_from_1(data);
374
374
 
607
607
        heap = mem_heap_create(size + dtuple_get_n_fields(entry)
608
608
                               * sizeof(big_rec_field_t) + 1000);
609
609
 
610
 
        vector = static_cast<big_rec_t>(mem_heap_alloc(heap, sizeof(big_rec_t)));
 
610
        vector = static_cast<big_rec_t *>(mem_heap_alloc(heap, sizeof(big_rec_t)));
611
611
 
612
612
        vector->heap = heap;
613
613
        vector->fields = static_cast<big_rec_field_t *>(mem_heap_alloc(heap, dtuple_get_n_fields(entry)