← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2010-12-03 01:16:19 UTC
  • mfrom: (1819.9.81 update-innobase)
  • Revision ID: kalebral@gmail.com-20101203011619-n6v584rijwdet05b
Merge Stewart - update Innobase plugin based on InnoDB 1.1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/data/data0data.c
367
367
        prtype = dtype_get_prtype(dfield_get_type(dfield));
368
368
 
369
369
        switch (dtype_get_mtype(dfield_get_type(dfield))) {
370
 
                dulint  id;
 
370
                ib_id_t id;
371
371
        case DATA_INT:
372
372
                switch (len) {
373
373
                        ulint   val;
419
419
 
420
420
                case 6:
421
421
                        id = mach_read_from_6(data);
422
 
                        fprintf(stderr, "{%lu %lu}",
423
 
                                ut_dulint_get_high(id),
424
 
                                ut_dulint_get_low(id));
 
422
                        fprintf(stderr, "%llu", (ullint) id);
425
423
                        break;
426
424
 
427
425
                case 7:
428
426
                        id = mach_read_from_7(data);
429
 
                        fprintf(stderr, "{%lu %lu}",
430
 
                                ut_dulint_get_high(id),
431
 
                                ut_dulint_get_low(id));
 
427
                        fprintf(stderr, "%llu", (ullint) id);
432
428
                        break;
433
429
                case 8:
434
430
                        id = mach_read_from_8(data);
435
 
                        fprintf(stderr, "{%lu %lu}",
436
 
                                ut_dulint_get_high(id),
437
 
                                ut_dulint_get_low(id));
 
431
                        fprintf(stderr, "%llu", (ullint) id);
438
432
                        break;
439
433
                default:
440
434
                        goto print_hex;
446
440
                case DATA_TRX_ID:
447
441
                        id = mach_read_from_6(data);
448
442
 
449
 
                        fprintf(stderr, "trx_id " TRX_ID_FMT,
450
 
                                TRX_ID_PREP_PRINTF(id));
 
443
                        fprintf(stderr, "trx_id " TRX_ID_FMT, id);
451
444
                        break;
452
445
 
453
446
                case DATA_ROLL_PTR:
454
447
                        id = mach_read_from_7(data);
455
448
 
456
 
                        fprintf(stderr, "roll_ptr {%lu %lu}",
457
 
                                ut_dulint_get_high(id), ut_dulint_get_low(id));
 
449
                        fprintf(stderr, "roll_ptr " TRX_ID_FMT, id);
458
450
                        break;
459
451
 
460
452
                case DATA_ROW_ID:
461
453
                        id = mach_read_from_6(data);
462
454
 
463
 
                        fprintf(stderr, "row_id {%lu %lu}",
464
 
                                ut_dulint_get_high(id), ut_dulint_get_low(id));
 
455
                        fprintf(stderr, "row_id " TRX_ID_FMT, id);
465
456
                        break;
466
457
 
467
458
                default:
468
 
                        id = mach_dulint_read_compressed(data);
 
459
                        id = mach_ull_read_compressed(data);
469
460
 
470
 
                        fprintf(stderr, "mix_id {%lu %lu}",
471
 
                                ut_dulint_get_high(id), ut_dulint_get_low(id));
 
461
                        fprintf(stderr, "mix_id " TRX_ID_FMT, id);
472
462
                }
473
463
                break;
474
464
 
698
688
                                goto skip_field;
699
689
                        }
700
690
 
 
691
                        /* In DYNAMIC and COMPRESSED format, store
 
692
                        locally any non-BLOB columns whose maximum
 
693
                        length does not exceed 256 bytes.  This is
 
694
                        because there is no room for the "external
 
695
                        storage" flag when the maximum length is 255
 
696
                        bytes or less. This restriction trivially
 
697
                        holds in REDUNDANT and COMPACT format, because
 
698
                        there we always store locally columns whose
 
699
                        length is up to local_len == 788 bytes.
 
700
                        @see rec_init_offsets_comp_ordinary */
 
701
                        if (ifield->col->mtype != DATA_BLOB
 
702
                            && ifield->col->len < 256) {
 
703
                                goto skip_field;
 
704
                        }
 
705
 
701
706
                        longest_i = i;
702
707
                        longest = savings;
703
708