← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/row/row0sel.c

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/row/row0sel.c
4608
4608
/*===========================*/
4609
4609
                                        /* out: value read from the column */
4610
4610
        dict_index_t*   index,          /* in: index to read from */
4611
 
        const rec_t*    rec,            /* in: current rec */
 
4611
        rec_t*  rec,            /* in: current rec */
4612
4612
        ulint           col_no,         /* in: column number */
4613
4613
        ibool           unsigned_type)  /* in: signed or unsigned flag */
4614
4614
{
4623
4623
 
4624
4624
        *offsets_ = sizeof offsets_ / sizeof *offsets_;
4625
4625
 
4626
 
        /* TODO: We have to cast away the const of rec for now.  This needs
4627
 
        to be fixed later.*/
4628
 
        offsets = rec_get_offsets(
4629
 
                (rec_t*) rec, index, offsets, ULINT_UNDEFINED, &heap);
 
4626
        offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
4630
4627
 
4631
 
        /* TODO: We have to cast away the const of rec for now.  This needs
4632
 
        to be fixed later.*/
4633
 
        data = rec_get_nth_field((rec_t*)rec, offsets, col_no, &len);
 
4628
        data = rec_get_nth_field(rec, offsets, col_no, &len);
4634
4629
 
4635
4630
        ut_a(len != UNIV_SQL_NULL);
4636
4631
        ut_a(len <= sizeof value);
4679
4674
/***********************************************************************
4680
4675
Get the last row. */
4681
4676
static
4682
 
const rec_t*
 
4677
rec_t*
4683
4678
row_search_autoinc_get_rec(
4684
4679
/*=======================*/
4685
4680
                                        /* out: current rec or NULL */
4687
4682
        mtr_t*          mtr)            /* in: mini transaction */
4688
4683
{
4689
4684
        do {
4690
 
                const rec_t* rec = btr_pcur_get_rec(pcur);
 
4685
                rec_t* rec = btr_pcur_get_rec(pcur);
4691
4686
 
4692
4687
                if (page_rec_is_user_rec(rec)) {
4693
4688
                        return(rec);
4741
4736
                        FALSE, index, BTR_SEARCH_LEAF, &pcur, TRUE, &mtr);
4742
4737
 
4743
4738
                if (page_get_n_recs(btr_pcur_get_page(&pcur)) > 0) {
4744
 
                        const rec_t*    rec;
 
4739
                        rec_t*  rec;
4745
4740
 
4746
4741
                        rec = row_search_autoinc_get_rec(&pcur, &mtr);
4747
4742