← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/innobase/dict/dict0dict.c

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/dict/dict0dict.c
1740
1740
        if (field->fixed_len > DICT_MAX_INDEX_COL_LEN) {
1741
1741
                field->fixed_len = 0;
1742
1742
        }
1743
 
#if DICT_MAX_INDEX_COL_LEN != 768
 
1743
#if DICT_MAX_INDEX_COL_LEN != 1024
1744
1744
        /* The comparison limit above must be constant.  If it were
1745
1745
        changed, the disk format of some fixed-length columns would
1746
1746
        change, which would be a disaster. */
1747
 
# error "DICT_MAX_INDEX_COL_LEN != 768"
 
1747
# error "DICT_MAX_INDEX_COL_LEN != 1024"
1748
1748
#endif
1749
1749
 
1750
1750
        if (!(col->prtype & DATA_NOT_NULL)) {