← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge initial InnoDB+ import.

This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e

Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.

This takes us to InnoDB 1.1.1(ish).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/data/data0data.c
683
683
                                goto skip_field;
684
684
                        }
685
685
 
686
 
                        /* In DYNAMIC and COMPRESSED format, store
687
 
                        locally any non-BLOB columns whose maximum
688
 
                        length does not exceed 256 bytes.  This is
689
 
                        because there is no room for the "external
690
 
                        storage" flag when the maximum length is 255
691
 
                        bytes or less. This restriction trivially
692
 
                        holds in REDUNDANT and COMPACT format, because
693
 
                        there we always store locally columns whose
694
 
                        length is up to local_len == 788 bytes.
695
 
                        @see rec_init_offsets_comp_ordinary */
696
 
                        if (ifield->col->mtype != DATA_BLOB
697
 
                            && ifield->col->len < 256) {
698
 
                                goto skip_field;
699
 
                        }
700
 
 
701
686
                        longest_i = i;
702
687
                        longest = savings;
703
688