← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_create.c

Merged in Jay's tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_create.c
109
109
      if (type == FIELD_BLOB)
110
110
      {
111
111
        share.base.blobs++;
112
 
        if (pack_reclength != INT_MAX32)
 
112
        if (pack_reclength != INT32_MAX)
113
113
        {
114
114
          if (rec->length == 4+portable_sizeof_char_ptr)
115
 
            pack_reclength= INT_MAX32;
 
115
            pack_reclength= INT32_MAX;
116
116
          else
117
117
            pack_reclength+=(1 << ((rec->length-portable_sizeof_char_ptr)*8)); /* Max blob length */
118
118
        }
120
120
      else if (type == FIELD_SKIP_PRESPACE ||
121
121
               type == FIELD_SKIP_ENDSPACE)
122
122
      {
123
 
        if (pack_reclength != INT_MAX32)
 
123
        if (pack_reclength != INT32_MAX)
124
124
          pack_reclength+= rec->length > 255 ? 2 : 1;
125
125
        min_pack_length++;
126
126
      }
188
188
    options|= HA_OPTION_RELIES_ON_SQL_LAYER;
189
189
 
190
190
  packed=(packed+7)/8;
191
 
  if (pack_reclength != INT_MAX32)
 
191
  if (pack_reclength != INT32_MAX)
192
192
    pack_reclength+= reclength+packed +
193
193
      test(test_all_bits(options, HA_OPTION_CHECKSUM | HA_PACK_RECORD));
194
194
  min_pack_length+=packed;
195
195
 
196
196
  if (!ci->data_file_length && ci->max_rows)
197
197
  {
198
 
    if (pack_reclength == INT_MAX32 ||
 
198
    if (pack_reclength == INT32_MAX ||
199
199
             (~(uint64_t) 0)/ci->max_rows < (uint64_t) pack_reclength)
200
200
      ci->data_file_length= ~(uint64_t) 0;
201
201
    else