← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/row/row0vers.c

  • Committer: Patrick Crews
  • Date: 2010-12-07 20:02:50 UTC
  • Revision ID: gleebix@gmail.com-20101207200250-6a27jgqalgw5bsb5
Added disabled.def file to disable drizzleslap due to Bug#684269.  Need to skip for tarball release this round

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/row/row0vers.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1997, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1997, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
71
71
                                        warning */
72
72
        trx_t*          trx;
73
73
        ulint           rec_del;
74
 
#ifdef UNIV_DEBUG
75
74
        ulint           err;
76
 
#endif /* UNIV_DEBUG */
77
75
        mtr_t           mtr;
78
76
        ulint           comp;
79
77
 
171
169
 
172
170
                heap2 = heap;
173
171
                heap = mem_heap_create(1024);
174
 
#ifdef UNIV_DEBUG
175
 
                err =
176
 
#endif /* UNIV_DEBUG */
177
 
                trx_undo_prev_version_build(clust_rec, &mtr, version,
178
 
                                            clust_index, clust_offsets,
179
 
                                            heap, &prev_version);
 
172
                err = trx_undo_prev_version_build(clust_rec, &mtr, version,
 
173
                                                  clust_index, clust_offsets,
 
174
                                                  heap, &prev_version);
180
175
                mem_heap_free(heap2); /* free version and clust_offsets */
181
176
 
182
177
                if (prev_version == NULL) {
550
545
                                /* The view already sees this version: we can
551
546
                                copy it to in_heap and return */
552
547
 
553
 
                                buf = static_cast<byte *>(mem_heap_alloc(in_heap,
554
 
                                                     rec_offs_size(*offsets)));
 
548
                                buf = mem_heap_alloc(in_heap,
 
549
                                                     rec_offs_size(*offsets));
555
550
                                *old_vers = rec_copy(buf, version, *offsets);
556
551
                                rec_offs_make_valid(*old_vers, index,
557
552
                                                    *offsets);
590
585
                        /* The view already sees this version: we can copy
591
586
                        it to in_heap and return */
592
587
 
593
 
                        buf = static_cast<byte *>(mem_heap_alloc(in_heap, rec_offs_size(*offsets)));
 
588
                        buf = mem_heap_alloc(in_heap, rec_offs_size(*offsets));
594
589
                        *old_vers = rec_copy(buf, prev_version, *offsets);
595
590
                        rec_offs_make_valid(*old_vers, index, *offsets);
596
591
                        err = DB_SUCCESS;
702
697
                                                           offset_heap);
703
698
                        }
704
699
 
705
 
                        buf = static_cast<byte *>(mem_heap_alloc(in_heap, rec_offs_size(*offsets)));
 
700
                        buf = mem_heap_alloc(in_heap, rec_offs_size(*offsets));
706
701
                        *old_vers = rec_copy(buf, version, *offsets);
707
702
                        rec_offs_make_valid(*old_vers, index, *offsets);
708
703
                        err = DB_SUCCESS;