← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_packrec.c

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_packrec.c
129
129
 
130
130
        /* Read all packed info, allocate memory and fix field structs */
131
131
 
132
 
my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys)
 
132
my_bool _mi_read_pack_info(MI_INFO *info, bool fix_keys)
133
133
{
134
134
  File file;
135
135
  int diff_length;
1385
1385
                             (((uint) ((uchar) bit_buff->pos[6])) << 8) +
1386
1386
                             (((uint) ((uchar) bit_buff->pos[5])) << 16) +
1387
1387
                             (((uint) ((uchar) bit_buff->pos[4])) << 24) +
1388
 
                             ((ulonglong)
 
1388
                             ((uint64_t)
1389
1389
                              ((((uint) ((uchar) bit_buff->pos[3]))) +
1390
1390
                               (((uint) ((uchar) bit_buff->pos[2])) << 8) +
1391
1391
                               (((uint) ((uchar) bit_buff->pos[1])) << 16) +